From 10bc6d269233514faf70a6f348c339f36b6097d5 Mon Sep 17 00:00:00 2001
From: Vinay Sachdeva <v.sachdeva@samsung.com>
Date: Tue, 16 Apr 2013 04:13:05 +0530
Subject: [PATCH] Fixed Nabi Issues

Change-Id: I6dd058b8f6ec9a55ee3c184e8b71a300a29dfa01
Signed-off-by: Vinay Sachdeva <v.sachdeva@samsung.com>
---
 inc/IntMainForm.h                              |  5 ++
 res/screen-size-normal/IDL_ADD_BOOKMARK.xml    |  4 +-
 res/screen-size-normal/IDL_FORM.xml            | 23 ++++----
 res/screen-size-normal/IDL_MULTIPLE_WINDOW.xml | 13 +++--
 src/IntAddBookmarkForm.cpp                     |  4 +-
 src/IntAddressbar.cpp                          | 10 +++-
 src/IntBookmarkListForm.cpp                    | 15 ++++-
 src/IntBookmarkPresentationModel.cpp           | 73 +-----------------------
 src/IntEditBookmarkListForm.cpp                | 40 ++++---------
 src/IntHistoryListForm.cpp                     | 10 ++--
 src/IntHistoryPresentationModel.cpp            |  2 -
 src/IntMainForm.cpp                            | 77 ++++++++++++++------------
 src/IntPresentationModelBase.cpp               | 75 +++++++++++++++++++++++--
 src/IntSharePopup.cpp                          |  8 +--
 14 files changed, 184 insertions(+), 175 deletions(-)

diff --git a/inc/IntMainForm.h b/inc/IntMainForm.h
index 218c331..bee3d06 100644
--- a/inc/IntMainForm.h
+++ b/inc/IntMainForm.h
@@ -51,6 +51,7 @@ class MainForm
 	, public Tizen::Ui::Controls::IListViewItemProvider
 	, public Tizen::Ui::IActionEventListener
 	, public IAddressbarEventListener
+	, public Tizen::Ui::IFocusEventListener
 	, public Tizen::Ui::Controls::IFormBackEventListener
 	, public Tizen::Ui::IKeypadEventListener
 	, public Tizen::Web::Controls::ILoadingListener
@@ -176,6 +177,10 @@ public:
 
 	void SetJavascriptEnabled(void);
 
+	void OnFocusGained(const Tizen::Ui::Control& source);
+	void OnFocusLost(const Tizen::Ui::Control& source){}
+
+
 	// IListViewItemEventListener
 	/**
 	 *Called when the state of an element in the ListContextItem is changed.
diff --git a/res/screen-size-normal/IDL_ADD_BOOKMARK.xml b/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
index 33e9039..fef83e2 100644
--- a/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
+++ b/res/screen-size-normal/IDL_ADD_BOOKMARK.xml
@@ -3,7 +3,7 @@
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201304081058" Dversion="20120315">
+<Scene Bversion="2.0.0.201304110859" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_ADD_BOOKMARK">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -41,7 +41,7 @@
     </Label>
     <ListView id="IDC_LISTVIEW1" parent="IDC_SCROLLPANEL2">
         <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="#FFFFFF" fastScroll="false" itemDivider="true" itemDividerColor="#8E9AA3" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="140.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL4" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="259.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="140.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="2.0" mode="Portrait" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_LABEL4" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="261.0"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="false" height="260.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_SCROLLPANEL2" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_SCROLLPANEL2" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1168.0" x="16.0" y="293.0"/>
     </ListView>
     <Label id="IDC_LABEL3" parent="IDC_SCROLLPANEL2">
diff --git a/res/screen-size-normal/IDL_FORM.xml b/res/screen-size-normal/IDL_FORM.xml
index b7903e2..9da6c6b 100644
--- a/res/screen-size-normal/IDL_FORM.xml
+++ b/res/screen-size-normal/IDL_FORM.xml
@@ -3,7 +3,8 @@
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201304041646" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201304110859" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -17,13 +18,13 @@
     </Panel>
     <Panel id="IDC_FOOTER_PANEL" parent="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="IDL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="1028.0"/>
+        <layout bottomRelation="IDL_FORM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="1108.0"/>
         <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="105.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" type="LAYOUT_RELATIVE" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="0" y="555.0"/>
     </Panel>
     <Label id="IDC_CHECK_LABEL" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" backgroundBitmapPath="I01_toolbar_bg_02.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="112.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="105.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="105.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
     </Label>
     <Button id="IDC_MULTIWINDOW_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_toolbar_icon_windows_manager_empty.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_controlbar_icon_multiview.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60.0" verticalAlign="ALIGN_MIDDLE"/>
@@ -33,17 +34,17 @@
     <Button id="IDC_PAGEFORWARD_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_toolbar_icon_forward_web.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_toolbar_icon_forward_press_web.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="635.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="1088.0" y="10.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_PANEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="1168.0" y="10.0"/>
     </Button>
     <Button id="IDC_PAGEBACK_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_toolbar_icon_back_web.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_toolbar_icon_back_press_web.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="63.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="63.0" x="542.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PAGEFORWARD_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="976.0" y="10.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="95.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PAGEFORWARD_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="112.0" x="1056.0" y="10.0"/>
     </Button>
     <Label id="IDC_FOOTER_LABEL" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" backgroundBitmapPath="I01_toolbar_bg_02.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="71.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="300.0" x="212.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MULTIWINDOW_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PAGEBACK_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="752.0" x="224.0" y="19.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MULTIWINDOW_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_PAGEBACK_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="832.0" x="224.0" y="19.0"/>
     </Label>
     <Button id="IDC_MORE_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="20.0" NormalBitmapY="20.0" PressedBitmapX="20.0" PressedBitmapY="20.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="I01_controlbar_icon_create_disable.png" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="EditBackground.png" normalBitmapPath="I01_controlbar_icon_more.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="EditBackground.png" pressedBitmapPath="I01_controlbar_icon_more.png" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="60.0" verticalAlign="ALIGN_MIDDLE"/>
@@ -53,27 +54,27 @@
     <Button id="IDC_REFRESH_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="I01_search_icon_refresh.png" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="65.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74.0" x="892.0" y="25.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="972.0" y="35.0"/>
     </Button>
     <EditField id="IDC_URL_EDIT_FIELD" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" disabledBGBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" ellipsisPosition="ELLIPSIS_POSITION_END" enableClear="false" groupStyle="GROUP_STYLE_NONE" guideText="" guideTextColor="" highlightedBGBitmapPath="EditBackground.png" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalMargin="16.0" inputStyle="INPUT_STYLE_OVERLAY" keypadAction="KEYPAD_ACTION_ENTER" keypadEnabled="true" limitLength="100" linkTextColor="" lowerCaseMode="false" normalBGBitmapPath="EditBackground.png" normalColor="" normalColorOpacity="100" normalTextColor="#4E4945" pressedBGBitmapPath="EditBackground.png" pressedColor="" pressedColorOpacity="100" text="" textHorizontalAlignment="ALIGNMENT_LEFT" textSize="32.0" titleStyle="EDIT_FIELD_TITLE_STYLE_NONE" titleText="" titleTextColor="" verticalMargin="12.0" viewMode="false"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="71.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="241.0" x="212.0" y="25.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MULTIWINDOW_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_REFRESH_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="668.0" x="224.0" y="19.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="78.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_MULTIWINDOW_BUTTON" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_REFRESH_BUTTON" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" style="EDIT_FIELD_STYLE_URL_SMALL" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="748.0" x="224.0" y="19.0"/>
     </EditField>
     <Label id="IDC_PROGRESS_BAR_LABEL" parent="IDC_FOOTER_PANEL">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
         <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0" y="0.0"/>
-        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1200.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="12.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280.0" x="0" y="0.0"/>
     </Label>
     <Button id="IDC_STOP_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="I01_field_btn_Clear.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="65.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74.0" x="892.0" y="25.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="972.0" y="35.0"/>
     </Button>
     <Button id="IDC_CLEAR_BUTTON" parent="IDC_FOOTER_PANEL">
         <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="I01_field_btn_Clear.png" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
         <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="43.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="42.0" x="454.0" y="40.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="65.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_FOOTER_LABEL" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="74.0" x="892.0" y="25.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="55.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="64.0" x="972.0" y="35.0"/>
     </Button>
     <Panel id="IDC_FIND_ON_PAGE_PANEL" parent="IDL_FORM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
diff --git a/res/screen-size-normal/IDL_MULTIPLE_WINDOW.xml b/res/screen-size-normal/IDL_MULTIPLE_WINDOW.xml
index 6295a18..014100d 100644
--- a/res/screen-size-normal/IDL_MULTIPLE_WINDOW.xml
+++ b/res/screen-size-normal/IDL_MULTIPLE_WINDOW.xml
@@ -3,10 +3,11 @@
 	This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="3.0.0.201301251814" Dversion="20120315">
+
+<Scene Bversion="2.0.0.201304110859" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_MULTIPLE_WINDOW">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Automatic:4Dir" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
@@ -15,12 +16,12 @@
         <itemSet/>
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="::IDS_BR_HEADER_MULTI_WINDOW" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="::IDS_BR_HEADER_MULTI_WINDOW" titleTextColor=""/>
         <itemSet/>
     </Header>
     <ListView id="IDC_LISTVIEW" parent="IDL_MULTIPLE_WINDOW">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" sweepEnabled="false" textOfEmptyList=""/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="1011" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_MULTIPLE_WINDOW" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_MULTIPLE_WINDOW" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="720" x="0" y="0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="464" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0" marginLeft="0" marginRight="0" marginTop="0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1280" x="0" y="0"/>
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="931.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="IDL_MULTIPLE_WINDOW" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="IDL_MULTIPLE_WINDOW" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_PARENT" width="720.0" x="0" y="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="484.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_PARENT" width="1200.0" x="0" y="0"/>
     </ListView>
 </Scene>
diff --git a/src/IntAddBookmarkForm.cpp b/src/IntAddBookmarkForm.cpp
index 0e4f634..7e89d4d 100644
--- a/src/IntAddBookmarkForm.cpp
+++ b/src/IntAddBookmarkForm.cpp
@@ -834,7 +834,9 @@ AddBookmarkForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
 				return;
 			}
 
-			pageTitle = pWindowInfo->pageTitle;
+			if(pWindowInfo->pageTitle.CompareTo(CommonUtil::GetString(L"IDS_BR_BODY_ABOUT_C_BLANK")) != 0)
+				pageTitle = pWindowInfo->pageTitle;
+
 			if(pWindowInfo->pageUrl.IsEmpty() == false)
 			{
 				pageUrl = pWindowInfo->pageUrl;
diff --git a/src/IntAddressbar.cpp b/src/IntAddressbar.cpp
index 375e8fd..e031916 100644
--- a/src/IntAddressbar.cpp
+++ b/src/IntAddressbar.cpp
@@ -777,8 +777,14 @@ Addressbar::GetLockedImageN(void)
 	Canvas* pCanvas = new (std::nothrow) Canvas();
 	pCanvas->Construct(Rectangle(0,0,__pFaviconLabel->GetWidth(),__pFaviconLabel->GetHeight()));
 	pCanvas->Clear();
-	pCanvas->DrawBitmap(Rectangle(0,0,__pFaviconLabel->GetWidth(),__pFaviconLabel->GetHeight()),*__pFavIcon);
-	pCanvas->DrawBitmap(Rectangle(__pFaviconLabel->GetWidth()/2,__pFaviconLabel->GetHeight()/2,__pFaviconLabel->GetWidth()/2,__pFaviconLabel->GetHeight()/2),*pIconImage);
+	if(__pFavIcon != null)
+	{
+		pCanvas->DrawBitmap(Rectangle(0,0,__pFaviconLabel->GetWidth(),__pFaviconLabel->GetHeight()),*__pFavIcon);
+	}
+	if(pIconImage != null)
+	{
+		pCanvas->DrawBitmap(Rectangle(__pFaviconLabel->GetWidth()/2,__pFaviconLabel->GetHeight()/2,__pFaviconLabel->GetWidth()/2,__pFaviconLabel->GetHeight()/2),*pIconImage);
+	}
 	pLockImage->Construct(*pCanvas,Rectangle(0,0,__pFaviconLabel->GetWidth(),__pFaviconLabel->GetHeight()));
 
 	delete pCanvas;
diff --git a/src/IntBookmarkListForm.cpp b/src/IntBookmarkListForm.cpp
index 868c156..2309cbc 100644
--- a/src/IntBookmarkListForm.cpp
+++ b/src/IntBookmarkListForm.cpp
@@ -671,10 +671,17 @@ BookmarkListForm::CreateItem(int index, int itemWidth)
 			pItem->SetContextItem(__pItemContextSite);
 		}
 	}
-
+	if(pImage != null)
+	{
+		delete pImage;
+	}
 	return pItem;
 
 	CATCH:
+	if(pImage != null)
+	{
+		delete pImage;
+	}
 	delete pItem;
 	pItem = null;
 	return null;
@@ -1098,8 +1105,10 @@ BookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneI
 {
 	AppLogDebug("BookmarkListForm::OnSceneActivatedN called");
 	ArrayListT<String> * pList = dynamic_cast<ArrayListT<String>* >(SceneManager::GetInstance()->GetSceneHistoryN());
-
-	pList->GetAt(pList->GetCount()-1,__previousSceneId);
+	if(pList != null)
+	{
+		pList->GetAt(pList->GetCount()-1,__previousSceneId);
+	}
 
 	__searchBookmark = false;
 	GetFooter()->SetShowState(true);
diff --git a/src/IntBookmarkPresentationModel.cpp b/src/IntBookmarkPresentationModel.cpp
index 8460bb4..b003f71 100644
--- a/src/IntBookmarkPresentationModel.cpp
+++ b/src/IntBookmarkPresentationModel.cpp
@@ -111,77 +111,8 @@ result
 BookmarkPresentationModel::SaveFolder(BookmarkData& bookmark)
 {
 	bookmark.SetParentId("-1");
-	SaveTempBookmark(bookmark);
-	/*
-	result r = E_FAILURE;
-	String bookmarkFolderTable(BOOKMARK_FOLDER_TABLE);
-	String query;
-	String columnNames;
-	int resultCount = -1;
-	int rowId = -1;
-	DateTime dt;
-	String bookmarkId;
-	String bookmarkTitle = bookmark.GetBookmarkTitle();
-	bookmarkTitle.Replace(L"'", L"''");
-
-	PresentationModelBase::GetCurrentDateTime(dt);
-	if (bookmark.GetBookmarkId() == "")
-	{
-		columnNames.Append(L"TITLE, ");
-		columnNames.Append(L"CREATED_TIME, ");
-		columnNames.Append(L"MODIFIED_TIME");
-
-		query.Append(L"INSERT INTO ");
-		query.Append(bookmarkFolderTable);
-		query.Append("(");
-		query.Append(columnNames);
-		query.Append(") ");
-		query.Append("VALUES(");
-		query.Append("'");
-		query.Append(bookmarkTitle);
-		query.Append("', ");
-		query.Append("'");
-		query.Append(dt.ToString());
-		query.Append("', ");
-		query.Append("'");
-		query.Append(dt.ToString());
-		query.Append("')");
-	}
-	else
-	{
-		query.Append(L"UPDATE ");
-		query.Append(bookmarkFolderTable);
-		query.Append(" SET TITLE = ");
-		query.Append("'");
-		query.Append(bookmarkTitle);
-		query.Append("'");
-		query.Append(", MODIFIED_TIME = ");
-		query.Append("'");
-		query.Append(dt.ToString());
-		query.Append("'");
-		query.Append(" WHERE ID = ");
-		query.Append(bookmark.GetBookmarkId());
-	}
-
-
-	r = PresentationModelBase::ExecuteQuery(query, resultCount);
-	TryCatch( r == E_SUCCESS,,"BookmarkPresentationModel::SaveFolder query failed  %s",GetErrorMessage(r));
-
-	r = PresentationModelBase::CommitDb();
-
-	r = GetLastInsertedId(bookmarkFolderTable, rowId);
-	TryCatch( r == E_SUCCESS,,"BookmarkPresentationModel::SaveFolder GetLastInsertedId failed %s",GetErrorMessage(r));
-
-	if (rowId < 0)
-		return E_FAILURE;
-
-	bookmarkId.Append(rowId);
-
-	//Set the generated ID to Bookmark
-	bookmark.SetBookmarkId(bookmarkId);
-
-    CATCH: return r;
-*/}
+	return SaveTempBookmark(bookmark);
+}
 
 result
 BookmarkPresentationModel::SaveBookmark(BookmarkData& bookmark)
diff --git a/src/IntEditBookmarkListForm.cpp b/src/IntEditBookmarkListForm.cpp
index 03dc173..40b7ff8 100644
--- a/src/IntEditBookmarkListForm.cpp
+++ b/src/IntEditBookmarkListForm.cpp
@@ -318,18 +318,20 @@ EditBookmarkListForm::OnActionPerformed(const Tizen::Ui::Control& source, int ac
 		labelString.Append(L"(");
 		labelString.Append(__pListview->GetItemCount());
 		labelString.Append(L")");
+		__selectedItemCount = 0;
 
 		__pInfoLabel->SetText(labelString);
 		__pInfoPanel->Draw();
 		__pInfoPanel->Show();
 
+		__pSelectedList->RemoveAll();
 		int totalCount = __pData->GetCount();
 		for(int index = 0; index <  totalCount; index++)
 		{
 			BookmarkData* pBookMark = dynamic_cast< BookmarkData* >(__pData->GetAt(index));
 			if (pBookMark == null)
 			{
-
+				continue;
 			}
 			String *pBookmarkId = new(std::nothrow) String();
 			if(pBookMark->GetBookmarkType() == BOOKMARK_TYPE_FOLDER)
@@ -575,32 +577,10 @@ EditBookmarkListForm::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView&
 		SceneManager* pSceneManager = SceneManager::GetInstance();
 		BookmarkData* pBookMark = dynamic_cast< BookmarkData* >(__pData->GetAt(index));
 
-
 		if(pBookMark == NULL)
 		{
 			return;
 		}
-		String *pBookmarkId = new(std::nothrow) String();
-		if(pBookMark->GetBookmarkType() == BOOKMARK_TYPE_FOLDER)
-		{
-			pBookmarkId->Append("F");
-		}
-		else
-		{
-			pBookmarkId->Append("U");
-		}
-		pBookmarkId->Append(pBookMark->GetBookmarkId());
-
-//		if (__pListview->IsItemChecked(index) == true)
-//		{
-//			__pListview->SetItemChecked(index, false);
-//			__pSelectedList->Remove(*pBookmarkId);
-//		}
-//		else
-//		{
-//			__pListview->SetItemChecked(index, true);
-//			__pSelectedList->Add(pBookmarkId);
-//		}
 
 		if (pBookMark->GetBookmarkType() == BOOKMARK_TYPE_FOLDER)
 		{
@@ -822,20 +802,24 @@ EditBookmarkListForm::OnSceneActivatedN(const SceneId& previousSceneId, const Sc
 			__pListview->SetItemChecked(index,false);
 		}
 	}
-	if(__selectedItemCount < __pListview->GetItemCount())
+	if(__selectedItemCount == 0)
 	{
-		__pCheckButton->SetSelected(false);
 		GetFooter()->SetItemEnabled(0, false);
 		GetFooter()->Invalidate(true);
 	}
 	else
 	{
-		__pCheckButton->SetSelected(true);
 		GetFooter()->SetItemEnabled(0, true);
 		GetFooter()->Invalidate(true);
 	}
-
-
+	if(__selectedItemCount < __pListview->GetItemCount())
+	{
+		__pCheckButton->SetSelected(false);
+	}
+	else
+	{
+		__pCheckButton->SetSelected(true);
+	}
 	__pInfoPanel->Draw();
 	__pInfoPanel->Show();
 
diff --git a/src/IntHistoryListForm.cpp b/src/IntHistoryListForm.cpp
index 8932e49..3f9116d 100644
--- a/src/IntHistoryListForm.cpp
+++ b/src/IntHistoryListForm.cpp
@@ -479,7 +479,6 @@ HistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 	GroupItemClass* pGroupItemClass = null;
 	CustomItem* pItem = new(std::nothrow) CustomItem();
 	int bookmarkBtnWidth = 0;
-	Bitmap* pBookmarkBitmap = null;
 	String bitmapId;
 
 	if(__pGroupData == null)
@@ -564,7 +563,6 @@ HistoryListForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
 	CATCH:
 	delete pItem;
-	delete pBookmarkBitmap;
 	return null;
 }
 
@@ -733,8 +731,10 @@ HistoryListForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
 	GetHeader()->SetItemSelected(1);
 //	__previousSceneId = previousSceneId;
 	ArrayListT<String> * pList = dynamic_cast<ArrayListT<String>* >(SceneManager::GetInstance()->GetSceneHistoryN());
-
-	pList->GetAt(pList->GetCount()-1,__previousSceneId);
+	if(pList != null)
+	{
+		pList->GetAt(pList->GetCount()-1,__previousSceneId);
+	}
 
 	AppLog("HistoryListForm::OnSceneActivatedN called");
 	//GetHeader()->Invalidate(true);
@@ -1168,14 +1168,12 @@ HistoryListForm::OnOrientationChanged(const Control& source, OrientationStatus o
 	result r = E_FAILURE;
 	if (__pGroupedListView != null)
 	{
-		AppLog("groupedlistview bounds %d,%d,%d",GetClientAreaBounds().height,__pSearchBar->GetHeight(),__pSearchBar->GetY());
 		if(__pSearchBar != null &&__pSearchBar->GetShowState())
 			r = __pGroupedListView->SetBounds(Rectangle(0,__pSearchBar->GetY() + __pSearchBar->GetHeight()/*72 + 30*/,GetClientAreaBounds().width,GetClientAreaBounds().height - __pSearchBar->GetHeight() - __pSearchBar->GetY()));
 		else if(__pSearchBar != null)
 			r = __pGroupedListView->SetBounds(Rectangle(0,0,GetClientAreaBounds().width,GetClientAreaBounds().height - __pSearchBar->GetHeight() - __pSearchBar->GetY()));
 		if (IsFailed(r))
 		{
-			AppLog("Error in OnOrientationChanged SetBounds %s values %d,%d,%d,%d",GetErrorMessage(r),0,__pSearchBar->GetY() + __pSearchBar->GetHeight()/*72 + 30*/,GetClientAreaBounds().width,GetClientAreaBounds().height - __pSearchBar->GetHeight() - __pSearchBar->GetY());
 			return;
 		}
 		__pGroupedListView->UpdateList();
diff --git a/src/IntHistoryPresentationModel.cpp b/src/IntHistoryPresentationModel.cpp
index 6ac04d1..73976af 100644
--- a/src/IntHistoryPresentationModel.cpp
+++ b/src/IntHistoryPresentationModel.cpp
@@ -356,8 +356,6 @@ HistoryPresentationModel::SaveTempHistory(History& history)
 	for(int count = 0; count < todaysCount; count++)
 	{
 		History *pHistoryItem  = dynamic_cast<History*>(pTodaysList->GetAt(count));
-		//AppLog("HistoryPresentationModel::saveHistory pHistoryItem id is %ls",pHistoryItem->GetHistoryId().GetPointer());
-		AppLog("SaveHistory pHistoryItem url is %ls",pHistoryItem->GetHistoryUrl().GetPointer());
 		AppLog("SaveHistory history url is %ls",history.GetHistoryUrl().GetPointer());
 
 		if(pHistoryItem != null && pHistoryItem->GetHistoryUrl().CompareTo(history.GetHistoryUrl()) == 0)
diff --git a/src/IntMainForm.cpp b/src/IntMainForm.cpp
index 58ad489..71efd52 100644
--- a/src/IntMainForm.cpp
+++ b/src/IntMainForm.cpp
@@ -453,6 +453,8 @@ MainForm::InitWebControl()
 	if (IsFailed(r))
 	{
 		AppLogDebug("Web construct failed with %s", GetErrorMessage(r));
+		delete __pWebViewer;
+		__pWebViewer = null;
 		return r;
 	}
 	else
@@ -490,6 +492,18 @@ MainForm::InitWebControl()
 }
 
 void
+MainForm::OnFocusGained(const Control& source)
+{
+	if(__pAddressbar != null)
+	{
+		__pFooterUrlField->SetFocusable(false);
+		__pAddressbar->SetAddressbarURLFocus();
+
+	}
+
+}
+
+void
 MainForm::SetJavascriptEnabled()
 {
 	WebSetting settings = __pWebViewer->GetSetting();
@@ -615,6 +629,7 @@ MainForm::InitFooter(void)
 	__pFooterUrlField->SetKeypadAction(KEYPAD_ACTION_GO);
 	//__pFooterUrlField->AddFocusEventListener(*this);
 	__pFooterUrlField->AddKeypadEventListener(*this);
+	__pFooterUrlField->AddFocusEventListener(*this);
 
 	if (SettingPresentationModel::GetInstance()->GetHomepage().CompareTo((L"IDS_BR_BODY_MOST_VISITED_SITES")) == 0)
 	{
@@ -2140,7 +2155,7 @@ MainForm::OnLoadingStarted(void)
 {
 	AppLogDebug("MainForm::OnLoadingStarted entered");
 	__isLoaded = true;
-	if(__pAddressbar == NULL)
+	if(__pAddressbar == NULL || __pWebViewer == null)
 	{
 		return;
 	}
@@ -2217,7 +2232,7 @@ MainForm::OnLoadingStarted(void)
 
 	//__pAddressbar->SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
 	SetAddressbarMode((AddressBarMode)ADDRESSBAR_MODE_LOADING);
-	if (__pWebViewer)
+	if (__pWebViewer != null)
 	{
 		AppLog("MainForm::OnLoadingStarted __pWebViewer->GetUrl() %ls",__pWebViewer->GetUrl().GetPointer());
 		//__pAddressbar->SetUrl(__pWebViewer->GetUrl());
@@ -2640,6 +2655,13 @@ MainForm::OnAddressCancelledClicked(const Addressbar& addBar)
 	// hiding the address bar
 	__pAddressbar->SetShowState(false);
 	__pFooterPanel->SetShowState(true);
+	if(__pWebViewer)
+		__pWebViewer->SetFocus();
+	else
+		__pMostVisitedListView->SetFocus();
+	__pFooterUrlField->SetFocusable(true);
+	__pMoreButton->SetFocus();
+
 	RelayoutControls(false);
 }
 
@@ -2682,8 +2704,14 @@ MainForm::OnAddressBarModeChanged(/*const Addressbar& addBar*/)
 void
 MainForm::OnAddressBarKeypadClosed(const Addressbar& addBar, bool footerState)
 {
-	__pAddressbar->SetShowState(false);
-	__pFooterPanel->SetShowState(true);
+	if(__pAddressbar)
+		__pAddressbar->SetShowState(false);
+	if(__pFooterPanel)
+		__pFooterPanel->SetShowState(true);
+	if(__pWebViewer)
+		__pWebViewer->SetFocus();
+	if(__pFooterUrlField)
+		__pFooterUrlField->SetFocusable(true);
 	RelayoutControls(false);
 }
 
@@ -2700,7 +2728,7 @@ MainForm::OnAddressBarKeypadOpened(const Addressbar& addBar)
 		{
 			__pAddressbar->SetShowState(true);
 			__pAddressbar->SetBounds(Rectangle(0,0,GetClientAreaBounds().width,__pAddressbar->GetHeight()));
-			__pAddressbar->SetAddressbarURLFocus();
+//			__pAddressbar->SetAddressbarURLFocus();
 		}
 	}
 
@@ -2815,7 +2843,6 @@ MainForm::OnLoadingRequested(const Tizen::Base::String& url,
 {
 	// when load new page if find word panel is open its show state is false
 	ShowFindWordPanel(false);
-	AppLog("__pAddressbar->GetAddressbarURL() is %ls",__pAddressbar->GetAddressbarURL().GetPointer());
 
 	__pFooterPanel->Invalidate(true);
 
@@ -2878,29 +2905,9 @@ MainForm::OnLoadingRequested(const Tizen::Base::String& url,
 		}
 	}
 
-	if (__pWebViewer && __pAddressbar)
+	if ( __pAddressbar != null)
 	{
 		__pAddressbar->SetShowState(false);
-		/*AppLog("__pWebViewer->GetUrl() %ls",__pWebViewer->GetUrl().GetPointer());
-		__pAddressbar->SetUrl(__pWebViewer->GetUrl());
-		__pAddressbar->UpdateProgress(DEFAULT_PROGRESS_PERCENTAGE);
-
-		if (__pWindowInfo)
-		{
-			__pWindowInfo->pageTitle = CommonUtil::GetString(L"IDS_BR_BODY_ABOUT_C_BLANK");
-			__pWindowInfo->pageUrl = __pWebViewer->GetUrl();
-			__pWindowInfo->faviconUrl = "";
-			__pWindowInfo->faviconFilePath = "";
-
-			if (__pWindowInfo->pFavicon != NULL)
-			{
-				//				delete __pWindowInfo->pFavicon;
-				__pWindowInfo->pFavicon = null ;
-			}
-			__pWindowInfo->pFavicon = FaviconManager::GetInstance()->GetDefaultFaviconN();
-
-		}*/
-
 		__pAddressbar->Invalidate(true);
 	}
 	return false;
@@ -3388,8 +3395,6 @@ void MainForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen:
 		__isLongPressedDone = true;
 		__pWebViewer->SetBlockSelectionPosition(currentPosition);
 
-
-
 	}
 	__inputEventToBeSupressed = true;
 }
@@ -3416,12 +3421,16 @@ MainForm::OnOrientationChanged (const Tizen::Ui::Control &source, Tizen::Ui::Ori
 {
 	AppLog("MainForm::OnOrientationChanged GetClientAreaBounds %d, %d",GetClientAreaBounds().width,GetClientAreaBounds().height);
 	int widthContextItem = 0;
-	ShowFindWordPanel(__pFindWordPanel->GetShowState(), false);
-	Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_SEARCH_INPUT_FIELD_BG, __pFooterLabel->GetWidth(), __pFooterLabel->GetHeight());
-	if (pBitmap != null && __pFooterLabel != null)
+	if(__pFindWordPanel != null)
+		ShowFindWordPanel(__pFindWordPanel->GetShowState(), false);
+	if ( __pFooterLabel != null)
 	{
-		__pFooterLabel->SetBackgroundBitmap(*pBitmap);
-		delete pBitmap;
+		Bitmap *pBitmap = CommonUtil::GetNinepatchedBitmapN(IDB_SEARCH_INPUT_FIELD_BG, __pFooterLabel->GetWidth(), __pFooterLabel->GetHeight());
+		if(pBitmap != null)
+		{
+			__pFooterLabel->SetBackgroundBitmap(*pBitmap);
+			delete pBitmap;
+		}
 	}
 
 	if (__pFindWordBgLabel != null)
diff --git a/src/IntPresentationModelBase.cpp b/src/IntPresentationModelBase.cpp
index d6826c6..3a011e7 100644
--- a/src/IntPresentationModelBase.cpp
+++ b/src/IntPresentationModelBase.cpp
@@ -450,8 +450,13 @@ PresentationModelBase::ExecuteBookmarkQuery(const Tizen::Base::String& formatQue
 				__pDbStatement->BindString(1,bookmark.GetParentId());
 				__pDbStatement->BindString(2,bookmarkUrl);
 				__pDbStatement->BindString(3,bookmarkTitle);
-				__pDbStatement->BindString(4,dt.ToString());
-				__pDbStatement->BindString(5,dt.ToString());
+				DateTimeFormatter *pFormatter = DateTimeFormatter::CreateDateFormatterN(DATE_TIME_STYLE_DEFAULT);
+				pFormatter->ApplyPattern(L"yyyy-mm-dd hh:mm:ss");
+				String dateStr;
+				pFormatter->Format(dt, dateStr);
+				AppLog("DateStr: %ls", dateStr.GetPointer());
+				__pDbStatement->BindString(4,dateStr);
+				__pDbStatement->BindString(5,dateStr);
 
 				if(bookmark.GetFavIconBuffer() != null)
 				{
@@ -569,7 +574,12 @@ PresentationModelBase::ExecuteHistoryQuery(const Tizen::Base::String& formatQuer
 				}
 				__pDbStatement->BindString(0,historyUrl);
 				__pDbStatement->BindString(1,historyTitle);
-				__pDbStatement->BindDateTime(2, date);
+				DateTimeFormatter *pFormatter = DateTimeFormatter::CreateDateFormatterN(DATE_TIME_STYLE_DEFAULT);
+				pFormatter->ApplyPattern(L"YYYY-MM-dd hh:mm:ss");
+				String dateStr;
+				pFormatter->Format(date, dateStr);
+				AppLog("DateStr: %ls", dateStr.GetPointer());
+				__pDbStatement->BindString(2, dateStr);
 				if(history.GetFavIconBuffer() != null)
 				{
 					__pDbStatement->BindBlob(3,*(history.GetFavIconBuffer()));
@@ -723,7 +733,64 @@ PresentationModelBase::GetColumn(int index, DateTime& dateValue)
 	if (IsFailed(r))
 	{
 		AppLogDebug("GetDateTimeAt: Failed");
-		return r;
+		String temp;
+		int currIndex = -1;
+		int nextIndex = -1;
+
+		int year = 0;
+		int month = 0;
+		int day = 0;
+		int hour = 0;
+		int min = 0;
+		int sec = 0;
+
+		int value = 0;
+		String dbColoumn = "";
+		__pDbEnum->GetStringAt(index, dbColoumn);
+		dbColoumn.IndexOf("-", 0, currIndex);
+		if(currIndex != -1)
+		{
+			dbColoumn.SubString(0, currIndex ,temp);
+			Integer::Parse(temp, 10, year);
+		}
+
+		dbColoumn.IndexOf("-", currIndex + 1, nextIndex);
+		if(currIndex != -1)
+		{
+			dbColoumn.SubString(currIndex + 1, nextIndex - currIndex - 1 ,temp);
+			Integer::Parse(temp, 10, month);
+		}
+		currIndex = nextIndex;
+
+		dbColoumn.IndexOf(" ", currIndex + 1, nextIndex);
+		if(currIndex != -1)
+		{
+			dbColoumn.SubString(currIndex + 1, nextIndex - currIndex -1 ,temp);
+			Integer::Parse(temp, 10, day);
+		}
+		currIndex = nextIndex;
+
+		dbColoumn.IndexOf(":", currIndex + 1, nextIndex);
+		if(currIndex != -1)
+		{
+			dbColoumn.SubString(currIndex + 1, nextIndex - currIndex -1 ,temp);
+			Integer::Parse(temp, 10, hour);
+		}
+		currIndex = nextIndex;
+
+		dbColoumn.IndexOf(":", currIndex + 1, nextIndex);
+		if(currIndex != -1)
+		{
+			dbColoumn.SubString(currIndex + 1, nextIndex - currIndex -1 ,temp);
+			Integer::Parse(temp, 10, min);
+		}
+		currIndex = nextIndex;
+
+		dbColoumn.SubString(currIndex + 1, temp);
+		Integer::Parse(temp, 10, sec);
+
+		dateValue.SetValue(year, month, day, hour, min, sec);
+		return E_SUCCESS;
 	}
 
 	return r;
diff --git a/src/IntSharePopup.cpp b/src/IntSharePopup.cpp
index 856dce2..d018f8c 100644
--- a/src/IntSharePopup.cpp
+++ b/src/IntSharePopup.cpp
@@ -362,13 +362,11 @@ SharePopup::StartEmailAppControl(void)
 	   delete pAc;
    }
    if (pShareInfo != null)
-	{
-		delete pShareInfo;
-	}
-   if(pDataList != null)
    {
-	   delete pDataList;
+	   delete pShareInfo;
    }
+   delete pDataList;
+
 }
 
 void
-- 
2.7.4