diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 54414a2..1957b72 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -8,6 +8,20 @@
         android:minSdkVersion="16"
         android:targetSdkVersion="19" />
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <!--
+     The following two permissions are not required to use
+     Google Maps Android API v2, but are recommended.
+    -->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
+    <uses-feature
+        android:glEsVersion="0x00020000"
+        android:required="true" />
+
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
@@ -39,6 +53,10 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.bookmyride.view.activity.BaseActivity" />
         </activity>
+
+        <meta-data
+            android:name="com.google.android.maps.v2.API_KEY"
+            android:value="AIzaSyB20jzKzSKfNk7O9HngQTX6S4jEU8oBhu8" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/res/layout/activity_login.xml b/res/layout/activity_login.xml
index 3935ea0..15fc535 100644
--- a/res/layout/activity_login.xml
+++ b/res/layout/activity_login.xml
@@ -42,7 +42,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/login_login" />
-     <Button
+
+    <Button
         android:id="@+id/resetbutton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
deleted file mode 100644
index 0a11eba..0000000
--- a/res/layout/activity_main.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/pager"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.bookmyride.MainActivity" />
diff --git a/res/layout/activity_order.xml b/res/layout/activity_order.xml
index 6c5c924..39a1925 100644
--- a/res/layout/activity_order.xml
+++ b/res/layout/activity_order.xml
@@ -1,8 +1,21 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/container"
+    android:id="@+id/orderLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.bookmyride.view.activity.OrderActivity"
-    tools:ignore="MergeRootFrame"
-     />
+    android:orientation="horizontal"
+    tools:context="com.bookmyride.view.activity.OrderActivity" >
+
+    <fragment
+        android:id="@+id/orderLocation"
+        android:name="com.bookmyride.view.fragments.OrderLocationFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <fragment
+        android:id="@+id/orderMap"
+        android:name="com.google.android.gms.maps.MapFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_main.xml b/res/layout/fragment_main.xml
deleted file mode 100644
index 79ed212..0000000
--- a/res/layout/fragment_main.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.bookmyride.MainActivity$PlaceholderFragment" >
-
-    <TextView
-        android:id="@+id/section_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</RelativeLayout>
diff --git a/res/layout/fragment_order_location.xml b/res/layout/fragment_order_location.xml
index 5108ab8..0cb0c3d 100644
--- a/res/layout/fragment_order_location.xml
+++ b/res/layout/fragment_order_location.xml
@@ -5,9 +5,7 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    >
-
+    android:paddingTop="@dimen/activity_vertical_margin" >
 
     <TextView
         android:id="@+id/orderPickUpAddressLabel"
@@ -41,5 +39,4 @@
         android:inputType="textWebPassword" >
     </EditText>
 
-
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 82d9d3c..8b197cf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -9,11 +9,15 @@
     <string name="login_id">Id</string>
     <string name="login_reset">Reset</string>
     <string name="login_failure">Login Failure! Try Again!</string>
-    <string name="title_section1">Section 1</string>
-    <string name="title_section2">Section 2</string>
-    <string name="title_section3">Section 3</string>
-    <string name="hello_world">Hello world!</string>
-    <string name="action_settings">Settings</string>
+   
+    <!-- Order Strings -->
+     <string name="order_pickup">Pickup Address</string>
+    <string name="order_dropin">Dropin Address</string>
+    <string name="order_car_suv">SUV</string>
+    <string name="order_car_sedan">Sedan</string>
+    <string name="order_car_hatchback">Hatchback</string>
+    
+    <!-- Activity titles -->
     <string name="title_activity_order">Order</string>
     <string name="title_activity_login">Login</string>
 
diff --git a/src/com/bookmyride/view/fragments/MapFragment.java b/src/com/bookmyride/view/fragments/OrderMapFragment.java
similarity index 91%
rename from src/com/bookmyride/view/fragments/MapFragment.java
rename to src/com/bookmyride/view/fragments/OrderMapFragment.java
index 87e9ab6..32c76a7 100644
--- a/src/com/bookmyride/view/fragments/MapFragment.java
+++ b/src/com/bookmyride/view/fragments/OrderMapFragment.java
@@ -7,7 +7,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-public class MapFragment extends Fragment{
+public class OrderMapFragment extends Fragment{
 
 	@Override
 	public View onCreateView(LayoutInflater inflater,