diff --git a/Kiwix-iOS/Controller/Bookmark/BookmarkController.swift b/Kiwix-iOS/Controller/Bookmark/BookmarkController.swift
new file mode 100644
index 00000000..2d1c6351
--- /dev/null
+++ b/Kiwix-iOS/Controller/Bookmark/BookmarkController.swift
@@ -0,0 +1,20 @@
+//
+//  BookmarkController.swift
+//  Kiwix
+//
+//  Created by Chris Li on 7/14/16.
+//  Copyright © 2016 Chris. All rights reserved.
+//
+
+import UIKit
+
+class BookmarkController: UIViewController {
+
+    @IBAction func dismissSelf(sender: UIBarButtonItem) {
+        dismissViewControllerAnimated(true, completion: nil)
+    }
+    override func viewDidLoad() {
+        super.viewDidLoad()
+    }
+
+}
diff --git a/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift b/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift
index 398a8e3a..fb26ba0e 100644
--- a/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift
+++ b/Kiwix-iOS/Controller/Main/MainControllerDelegates.swift
@@ -19,7 +19,8 @@ extension MainController: LPTBarButtonItemDelegate, TableOfContentsDelegate, Zim
         
         guard let controller = bookmarkController ?? UIStoryboard.main.initViewController("BookmarkNav", type: UINavigationController.self) else {return}
         bookmarkController = controller
-        controller.modalPresentationStyle = .FormSheet
+        controller.modalPresentationStyle = .OverFullScreen
+        controller.modalTransitionStyle = .CrossDissolve
         presentViewController(controller, animated: true, completion: nil)
     }
     
diff --git a/Kiwix-iOS/Info.plist b/Kiwix-iOS/Info.plist
index baf407ee..f188b18e 100644
--- a/Kiwix-iOS/Info.plist
+++ b/Kiwix-iOS/Info.plist
@@ -36,7 +36,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.7.3</string>
+	<string>1.7.39</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
diff --git a/Kiwix-iOS/Storyboard/Main.storyboard b/Kiwix-iOS/Storyboard/Main.storyboard
index 5c9a1b36..6dcc2aaa 100644
--- a/Kiwix-iOS/Storyboard/Main.storyboard
+++ b/Kiwix-iOS/Storyboard/Main.storyboard
@@ -93,6 +93,84 @@
             </objects>
             <point key="canvasLocation" x="1853" y="1137"/>
         </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="Chb-d5-QuK">
+            <objects>
+                <navigationController storyboardIdentifier="BookmarkNav" id="SC6-zc-FOI" sceneMemberID="viewController">
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="FzZ-aO-kFH">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="vlo-nI-613" kind="relationship" relationship="rootViewController" id="5Zh-cj-wka"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="uPL-Lf-MgT" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1004" y="1965"/>
+        </scene>
+        <!--Bookmark Controller-->
+        <scene sceneID="Qye-hd-NOR">
+            <objects>
+                <viewController storyboardIdentifier="BookmarkController" id="vlo-nI-613" customClass="BookmarkController" customModule="Kiwix" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="kOf-Ud-GNI"/>
+                        <viewControllerLayoutGuide type="bottom" id="C7M-9M-S7W"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="Val-Tj-vas">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dz0-vV-4AE">
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="aU0-bx-DMr">
+                                    <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <subviews>
+                                        <visualEffectView opaque="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9Zs-gY-I9Y">
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" id="u4m-4I-wHl">
+                                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                            </view>
+                                            <vibrancyEffect>
+                                                <blurEffect style="extraLight"/>
+                                            </vibrancyEffect>
+                                        </visualEffectView>
+                                    </subviews>
+                                </view>
+                                <blurEffect style="extraLight"/>
+                            </visualEffectView>
+                        </subviews>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="Dz0-vV-4AE" firstAttribute="leading" secondItem="Val-Tj-vas" secondAttribute="leading" id="I8A-e3-7mJ"/>
+                            <constraint firstItem="C7M-9M-S7W" firstAttribute="top" secondItem="Dz0-vV-4AE" secondAttribute="bottom" id="UKb-1o-FRG"/>
+                            <constraint firstAttribute="trailing" secondItem="Dz0-vV-4AE" secondAttribute="trailing" id="itR-Ic-9FK"/>
+                            <constraint firstItem="Dz0-vV-4AE" firstAttribute="top" secondItem="Val-Tj-vas" secondAttribute="top" id="y17-gp-ASx"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" id="gjE-9o-dTy">
+                        <nil key="title"/>
+                        <segmentedControl key="titleView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="bar" selectedSegmentIndex="0" id="YCr-Jf-R0R">
+                            <rect key="frame" x="180" y="7" width="240" height="30"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <segments>
+                                <segment title="First"/>
+                                <segment title="Second"/>
+                            </segments>
+                        </segmentedControl>
+                        <barButtonItem key="rightBarButtonItem" title="dismiss" id="Eeg-5m-aLE">
+                            <connections>
+                                <action selector="dismissSelf:" destination="vlo-nI-613" id="b2f-yh-ctB"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="bpe-1x-s38" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1661" y="1965"/>
+        </scene>
         <!--BookmarkHUDVC-->
         <scene sceneID="PBK-Zl-kOY">
             <objects>
@@ -543,7 +621,7 @@
         <!--Navigation Controller-->
         <scene sceneID="TmE-cH-Z0r">
             <objects>
-                <navigationController storyboardIdentifier="BookmarkNav" automaticallyAdjustsScrollViewInsets="NO" id="7So-3x-feX" sceneMemberID="viewController">
+                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="7So-3x-feX" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="liO-Vk-25p">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj
index c4e52fa8..bf167ad0 100644
--- a/Kiwix.xcodeproj/project.pbxproj
+++ b/Kiwix.xcodeproj/project.pbxproj
@@ -95,6 +95,7 @@
 		971A107F1D022F74007FC62C /* ImportBookLearnMore.html in Resources */ = {isa = PBXBuildFile; fileRef = 971A107B1D022F74007FC62C /* ImportBookLearnMore.html */; };
 		971A10801D022F74007FC62C /* Pic_I.png in Resources */ = {isa = PBXBuildFile; fileRef = 971A107C1D022F74007FC62C /* Pic_I.png */; };
 		971A10811D022F74007FC62C /* Pic_P.png in Resources */ = {isa = PBXBuildFile; fileRef = 971A107D1D022F74007FC62C /* Pic_P.png */; };
+		97219DBD1D383A00009FDFF1 /* BookmarkController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97219DBC1D383A00009FDFF1 /* BookmarkController.swift */; };
 		9734E54E1D289D060061C39B /* Welcome.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9734E54D1D289D060061C39B /* Welcome.storyboard */; };
 		973BCCEC1CEB3FA400F10B44 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 973BCCEB1CEB3FA400F10B44 /* AppDelegate.swift */; };
 		973BCCF31CEB3FA400F10B44 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 973BCCF21CEB3FA400F10B44 /* Assets.xcassets */; };
@@ -337,6 +338,7 @@
 		971A107B1D022F74007FC62C /* ImportBookLearnMore.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = ImportBookLearnMore.html; path = Kiwix/HelpDocuments/ImportBookLearnMore.html; sourceTree = SOURCE_ROOT; };
 		971A107C1D022F74007FC62C /* Pic_I.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Pic_I.png; path = Kiwix/HelpDocuments/Pic_I.png; sourceTree = SOURCE_ROOT; };
 		971A107D1D022F74007FC62C /* Pic_P.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Pic_P.png; path = Kiwix/HelpDocuments/Pic_P.png; sourceTree = SOURCE_ROOT; };
+		97219DBC1D383A00009FDFF1 /* BookmarkController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BookmarkController.swift; path = "Kiwix-iOS/Controller/Bookmark/BookmarkController.swift"; sourceTree = SOURCE_ROOT; };
 		9734E54D1D289D060061C39B /* Welcome.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = Welcome.storyboard; path = "Kiwix-iOS/Storyboard/Welcome.storyboard"; sourceTree = SOURCE_ROOT; };
 		973BCCE91CEB3FA400F10B44 /* Kiwix.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Kiwix.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		973BCCEB1CEB3FA400F10B44 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = "Kiwix-OSX/AppDelegate.swift"; sourceTree = SOURCE_ROOT; };
@@ -825,6 +827,7 @@
 			isa = PBXGroup;
 			children = (
 				971A10331D022AEC007FC62C /* BookmarkTBVC.swift */,
+				97219DBC1D383A00009FDFF1 /* BookmarkController.swift */,
 			);
 			name = Bookmark;
 			sourceTree = "<group>";
@@ -927,8 +930,8 @@
 		978C587A1C1CCC9C0077AE47 /* Storyboards */ = {
 			isa = PBXGroup;
 			children = (
-				975227C91D0227E8001D1DDE /* Library.storyboard */,
 				975227CA1D0227E8001D1DDE /* Main.storyboard */,
+				975227C91D0227E8001D1DDE /* Library.storyboard */,
 				97F03CE11D2440470040D26E /* Search.storyboard */,
 				975227CB1D0227E8001D1DDE /* Setting.storyboard */,
 				9734E54D1D289D060061C39B /* Welcome.storyboard */,
@@ -1650,6 +1653,7 @@
 				971A103C1D022C2C007FC62C /* FontSizeTBVC.swift in Sources */,
 				971A103B1D022C2C007FC62C /* AdjustLayoutTBVC.swift in Sources */,
 				975227A21D020C00001D1DDE /* stringTools.cpp in Sources */,
+				97219DBD1D383A00009FDFF1 /* BookmarkController.swift in Sources */,
 				9711879A1CEB546C00B9909D /* CoreDataExtension.swift in Sources */,
 				970C61971D34243600087758 /* URLSessionDownloadTaskOperation.swift in Sources */,
 				971A10341D022AEC007FC62C /* BookmarkTBVC.swift in Sources */,