diff --git a/AdaptersDiagram.suml b/AdaptersDiagram.suml
new file mode 100644
index 0000000000..45a8e3d529
--- /dev/null
+++ b/AdaptersDiagram.suml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Classdiagram><settings><option name="paintImplements" value="true" /><option name="paintDepends" value="false" /><option name="layoutOnChanges" value="false" /><option name="paintUses" value="true" /><option name="paintInner" value="true" /><option name="paintExtends" value="true" /></settings><classes><class name="adapters.CardViewOptionsAdapter" x="5" y="3"><option name="pinned" value="false" /><option name="fieldsExpanded" value="true" /><option name="constructorsExpanded" value="true" /><option name="methodsExpanded" value="true" /></class><class name="adapters.RestaurantsCardViewAdapter" x="323" y="4"><option name="pinned" value="false" /><option name="fieldsExpanded" value="true" /><option name="constructorsExpanded" value="true" /><option name="methodsExpanded" value="true" /></class><class name="adapters.ContributorsAdapter" x="0" y="164"><option name="pinned" value="false" /><option name="fieldsExpanded" value="true" /><option name="constructorsExpanded" value="true" /><option name="methodsExpanded" value="true" /></class><class name="adapters.ImageAdapter" x="0" y="369"><option name="pinned" value="false" /><option name="fieldsExpanded" value="true" /><option name="constructorsExpanded" value="true" /><option name="methodsExpanded" value="true" /></class><class name="adapters.NestedListView" x="345" y="173"><option name="pinned" value="false" /><option name="fieldsExpanded" value="true" /><option name="constructorsExpanded" value="true" /><option name="methodsExpanded" value="true" /></class></classes><stickycomponents /><textcomponents /><connectors /></Classdiagram>
diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/HotelsActivity.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/HotelsActivity.java
index 4a48bf042f..58019cd549 100644
--- a/Android/app/src/main/java/io/github/project_travel_mate/travel/HotelsActivity.java
+++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/HotelsActivity.java
@@ -86,7 +86,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
 
         ButterKnife.bind(this);
-
         recyclerView.setLayoutManager(new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL));
 
         mHandler = new Handler(Looper.getMainLooper());
diff --git a/Android/app/src/main/java/io/github/project_travel_mate/utilities/OfflineMapsFragment.java b/Android/app/src/main/java/io/github/project_travel_mate/utilities/OfflineMapsFragment.java
new file mode 100644
index 0000000000..911bd1bc5e
--- /dev/null
+++ b/Android/app/src/main/java/io/github/project_travel_mate/utilities/OfflineMapsFragment.java
@@ -0,0 +1,13 @@
+package io.github.project_travel_mate.utilities;
+
+import android.content.Intent;
+import android.support.v4.app.Fragment;
+
+import adapters.CardViewOptionsAdapter;
+
+public class OfflineMapsFragment extends Fragment implements CardViewOptionsAdapter.OnItemClickListener {
+    @Override
+    public void onItemClick(int position) {
+        Intent intent;
+    }
+}
diff --git a/Android/app/src/main/res/drawable/ic_map_black_24dp.xml b/Android/app/src/main/res/drawable/ic_map_black_24dp.xml
new file mode 100644
index 0000000000..b9bacc8a6e
--- /dev/null
+++ b/Android/app/src/main/res/drawable/ic_map_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+</vector>
diff --git a/Android/app/src/main/res/drawable/ic_maps.png b/Android/app/src/main/res/drawable/ic_maps.png
new file mode 100644
index 0000000000..fc7988a39e
Binary files /dev/null and b/Android/app/src/main/res/drawable/ic_maps.png differ
diff --git a/Android/app/src/main/res/layout/city_history_listitem.xml b/Android/app/src/main/res/layout/city_history_listitem.xml
index 3bad825769..f35dc09a5f 100644
--- a/Android/app/src/main/res/layout/city_history_listitem.xml
+++ b/Android/app/src/main/res/layout/city_history_listitem.xml
@@ -2,26 +2,29 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
     android:layout_margin="5dp"
-    android:paddingStart="5dp"
-    android:paddingEnd="5dp">
+    android:orientation="horizontal"
+    android:paddingEnd="5dp"
+    android:paddingStart="5dp">
+
     <TextView
+        android:id="@+id/heading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textStyle="bold"
-        android:textSize="18sp"
         android:textColor="@color/black"
-        android:id="@+id/heading"/>
+        android:textSize="18sp"
+        android:textStyle="bold" />
+
     <utils.ExpandableTextView
+        android:id="@+id/text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/text"
         android:textColor="@color/black"
-        android:textSize="14sp"/>
+        android:textSize="14sp" />
+
     <View
         android:layout_width="fill_parent"
         android:layout_height="1dp"
         android:layout_marginTop="10dp"
         android:background="@color/colorAccent" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/Android/app/src/main/res/layout/fragment_offlinemaps.xml b/Android/app/src/main/res/layout/fragment_offlinemaps.xml
new file mode 100644
index 0000000000..4e61a950f4
--- /dev/null
+++ b/Android/app/src/main/res/layout/fragment_offlinemaps.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.widget.ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent" android:layout_height="match_parent">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/offlinemaps_list_recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</android.widget.ScrollView>
\ No newline at end of file
diff --git a/Android/app/src/main/res/menu/activity_main_drawer.xml b/Android/app/src/main/res/menu/activity_main_drawer.xml
index 2dabd45803..c153aa38bb 100644
--- a/Android/app/src/main/res/menu/activity_main_drawer.xml
+++ b/Android/app/src/main/res/menu/activity_main_drawer.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <group android:checkableBehavior="single" android:id="@+id/nav_grp1">
+    <group
+        android:id="@+id/nav_grp1"
+        android:checkableBehavior="single">
         <item
             android:id="@+id/nav_city"
             android:icon="@drawable/ic_location_city_black"
@@ -26,6 +28,10 @@
             android:id="@+id/nav_utility"
             android:icon="@drawable/ic_utilities"
             android:title="@string/navigation_drawer_utilities" />
+        <item
+            android:id="@+id/nav_offlinemaps"
+            android:icon="@drawable/ic_map_black_24dp"
+            android:title="@string/navigation_drawer_offlinemaps" />
 
     </group>
 
diff --git a/Android/app/src/main/res/values/strings.xml b/Android/app/src/main/res/values/strings.xml
index 9ca88d94ad..f025b6a1b5 100644
--- a/Android/app/src/main/res/values/strings.xml
+++ b/Android/app/src/main/res/values/strings.xml
@@ -8,6 +8,7 @@
     <string name="navigation_drawer_destination">Destinations</string>
     <string name="navigation_drawer_travel">Travel</string>
     <string name="navigation_drawer_utilities">Utilities</string>
+    <string name="navigation_drawer_offlinemaps">Offline Maps</string>
     <string name="navigation_drawer_about_us">About Us</string>
     <string name="navigation_drawer_signout">Sign Out</string>
     <string name="navigation_drawer_my_friends">My Friends</string>
diff --git a/Database_UML.suml b/Database_UML.suml
new file mode 100644
index 0000000000..498ccd4f45
--- /dev/null
+++ b/Database_UML.suml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Classdiagram><settings><option name="paintImplements" value="true" /><option name="paintDepends" value="false" /><option name="layoutOnChanges" value="false" /><option name="paintUses" value="false" /><option name="paintInner" value="true" /><option name="paintExtends" value="true" /></settings><classes><class name="database.Converters" x="0" y="0"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class><class name="database.AppDataBase" x="0" y="0"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="false" /></class></classes><stickycomponents /><textcomponents /><connectors><connector from="database.AppDataBase" to="database.AppDataBase"><anchor constraint="1" type="2" x="175" y="67" /><anchor constraint="1" type="1" x="175" y="92" /><anchor constraint="1" type="1" x="219" y="92" /><anchor constraint="1" type="1" x="219" y="33" /><anchor constraint="1" type="2" x="209" y="33" /><decorator type="4" description="-  instance" /></connector></connectors></Classdiagram>
diff --git a/UML_Diagrams/AdaptersDiagram.suml b/UML_Diagrams/AdaptersDiagram.suml
new file mode 100644
index 0000000000..45a8e3d529
--- /dev/null
+++ b/UML_Diagrams/AdaptersDiagram.suml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Classdiagram><settings><option name="paintImplements" value="true" /><option name="paintDepends" value="false" /><option name="layoutOnChanges" value="false" /><option name="paintUses" value="true" /><option name="paintInner" value="true" /><option name="paintExtends" value="true" /></settings><classes><class name="adapters.CardViewOptionsAdapter" x="5" y="3"><option name="pinned" value="false" /><option name="fieldsExpanded" value="true" /><option name="constructorsExpanded" value="true" /><option name="methodsExpanded" value="true" /></class><class name="adapters.RestaurantsCardViewAdapter" x="323" y="4"><option name="pinned" value="false" /><option name="fieldsExpanded" value="true" /><option name="constructorsExpanded" value="true" /><option name="methodsExpanded" value="true" /></class><class name="adapters.ContributorsAdapter" x="0" y="164"><option name="pinned" value="false" /><option name="fieldsExpanded" value="true" /><option name="constructorsExpanded" value="true" /><option name="methodsExpanded" value="true" /></class><class name="adapters.ImageAdapter" x="0" y="369"><option name="pinned" value="false" /><option name="fieldsExpanded" value="true" /><option name="constructorsExpanded" value="true" /><option name="methodsExpanded" value="true" /></class><class name="adapters.NestedListView" x="345" y="173"><option name="pinned" value="false" /><option name="fieldsExpanded" value="true" /><option name="constructorsExpanded" value="true" /><option name="methodsExpanded" value="true" /></class></classes><stickycomponents /><textcomponents /><connectors /></Classdiagram>
diff --git a/UML_Diagrams/DAO_Diagrams.suml b/UML_Diagrams/DAO_Diagrams.suml
new file mode 100644
index 0000000000..fdfbf23457
--- /dev/null
+++ b/UML_Diagrams/DAO_Diagrams.suml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Classdiagram><settings><option name="paintImplements" value="true" /><option name="paintDepends" value="false" /><option name="layoutOnChanges" value="false" /><option name="paintUses" value="false" /><option name="paintInner" value="true" /><option name="paintExtends" value="true" /></settings><classes><class name="dao.CityDao" x="2" y="4"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="true" /></class><class name="dao.WidgetCheckListDao" x="3" y="134"><option name="pinned" value="false" /><option name="fieldsExpanded" value="false" /><option name="constructorsExpanded" value="false" /><option name="methodsExpanded" value="true" /></class></classes><stickycomponents /><textcomponents /><connectors /></Classdiagram>
diff --git a/screenshots/OfflineMapsPrototype.png b/screenshots/OfflineMapsPrototype.png
new file mode 100644
index 0000000000..b2a1b1a8e5
Binary files /dev/null and b/screenshots/OfflineMapsPrototype.png differ