diff --git a/res/layout/activity_submit_building.xml b/res/layout/activity_submit_building.xml
index 8beaaca..f7aadf7 100644
--- a/res/layout/activity_submit_building.xml
+++ b/res/layout/activity_submit_building.xml
@@ -1,66 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:map="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
+    android:layout_height="match_parent" >
+    
     <Button
         android:id="@+id/submit_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="58dp"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
         android:text="@string/submit" />
-
-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignRight="@+id/edit_text_abbreviation"
-        android:layout_alignTop="@+id/checkBox1"
-        android:text="@string/wheelchair_accessible"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <CheckBox
-        android:id="@+id/checkBox1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/edit_text_abbreviation"
-        android:layout_marginLeft="33dp"
-        android:layout_marginTop="36dp"
-        android:layout_toRightOf="@+id/textView1" />
-
+    
     <EditText
         android:id="@+id/edit_text_building_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
-        android:layout_toLeftOf="@+id/checkBox1"
+        android:layout_alignParentLeft="true"
+        android:layout_alignStart="@id/submit_button"
+        android:layout_marginTop="10dp"
         android:ems="10"
         android:hint="@string/building_name" />
-
+    
     <EditText
         android:id="@+id/edit_text_abbreviation"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/edit_text_building_name"
-        android:layout_marginTop="14dp"
+        android:layout_marginTop="10dp"
         android:ems="10"
-        android:hint="@string/abbreviation" >
-
-        <requestFocus />
-    </EditText>
+        android:hint="@string/abbreviation" />
+   
+    <TextView
+        android:id="@+id/accessible_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below = "@id/edit_text_abbreviation"
+        android:layout_marginTop="10dp"
+        android:padding="5dp"
+        android:ems="10"
+        android:text="@string/wheelchair_accessible"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
+    <CheckBox
+        android:id="@+id/checkBox1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/accessible_text"
+        android:layout_toRightOf="@+id/accessible_text" />
+    
+    <!--  Setting MissingPrefix to ignore is only required to circumvent a bug in the Linter linker which is included in the Android SDK.
+    	  Further details regarding this bug can be found at:	https://code.google.com/p/gmaps-api-issues/issues/detail?id=5002 
+	-->
+    
     <fragment
-        android:id="@+id/submitBuildingMap"
+        android:id="@+id/submit_map"
         android:name="com.google.android.gms.maps.MapFragment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/submit_button"
         android:layout_alignParentLeft="true"
-        android:layout_below="@+id/checkBox1"
+        android:layout_marginTop="10dp"
+        android:layout_below="@id/accessible_text"
+        tools:ignore="MissingPrefix"
         map:cameraTargetLat="44.5657285"
 		map:cameraTargetLng="-123.2788689"
         map:cameraTilt="30"
@@ -71,23 +77,6 @@
         map:uiScrollGestures="true"
         map:uiTiltGestures="true"
         map:uiZoomControls="false"
-        map:uiZoomGestures="true"
-        tools:ignore="MissingPrefix" />
-
-    <Button
-        android:id="@+id/submit_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/textView1"
-        android:layout_alignParentBottom="true"
-        android:text="@string/submit" />
-
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_toRightOf="@+id/checkBox1"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        map:uiZoomGestures="true" />
     
 </RelativeLayout>
diff --git a/src/com/example/classlocus/BuildingDetail.java b/src/com/example/classlocus/BuildingDetail.java
index 94fb799..3642ef6 100644
--- a/src/com/example/classlocus/BuildingDetail.java
+++ b/src/com/example/classlocus/BuildingDetail.java
@@ -25,7 +25,7 @@ public class BuildingDetail extends Activity {
 	LocationManager manager;
 	Building building;
 	GoogleMap map;
-	BuildingsRepository db;
+	BuildingsRepository database;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -35,7 +35,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		getActionBar().setDisplayHomeAsUpEnabled(true);
 		getActionBar().setTitle("Building Detail");
 		
-		db = new BuildingsRepository(this);
+		database = new BuildingsRepository(this);
 		
 		map = ((MapFragment) getFragmentManager().findFragmentById(R.id.details_map)).getMap();
 		map.setMyLocationEnabled(true);
@@ -47,7 +47,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		TextView tv;
 		
 		if (getIntent().hasExtra("buildingID"))
-			building = populate(getIntent(), db);
+			building = populate(getIntent(), database);
 		
 		//populating fields
 		if (building != null){
@@ -98,7 +98,7 @@ public boolean onPrepareOptionsMenu (Menu menu){
 		inflater.inflate(R.menu.building_detail, menu);
 		
 	    MenuItem fav = menu.findItem(R.id.action_favorites);
-	    if(db.searchFavorites(building) != 0){
+	    if(database.searchFavorites(building) != 0){
 	    	fav.setIcon(getResources().getDrawable(R.drawable.ic_action_important));
 	    }
 	    return true;
@@ -109,12 +109,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		int fid;
 		switch (item.getItemId()) {
 		case R.id.action_favorites:
-			fid = db.searchFavorites(building);
+			fid = database.searchFavorites(building);
 			if (fid != 0) {
-				db.deleteFavorite(fid);
+				database.deleteFavorite(fid);
 				item.setIcon(getResources().getDrawable(R.drawable.ic_action_not_important));
 			} else {
-				db.saveFavorite(building);
+				database.saveFavorite(building);
 				item.setIcon(getResources().getDrawable(R.drawable.ic_action_important));
 			}
 			return true;
@@ -129,7 +129,7 @@ public double buildingDistance(LatLng coord1, LatLng coord2){
 	}
 	
 	public void addToFavorites() {	
-		db.saveFavorite(building);
+		database.saveFavorite(building);
 	}
 	
 	public void updateMapPosition(LatLng position) {
diff --git a/src/com/example/classlocus/MainActivity.java b/src/com/example/classlocus/MainActivity.java
index 6d3e673..119047c 100644
--- a/src/com/example/classlocus/MainActivity.java
+++ b/src/com/example/classlocus/MainActivity.java
@@ -31,8 +31,6 @@ protected void onCreate(Bundle savedInstanceState) {
 		
 		BuildingGenerator.initialDbState(this);
 		this.setContentView(R.layout.activity_main);
-		
-		
 	}
 	
 	@Override
diff --git a/src/com/example/classlocus/SubmitBuildingActivity.java b/src/com/example/classlocus/SubmitBuildingActivity.java
index 2c92ac2..7e788d4 100644
--- a/src/com/example/classlocus/SubmitBuildingActivity.java
+++ b/src/com/example/classlocus/SubmitBuildingActivity.java
@@ -2,23 +2,27 @@
 
 import com.example.classlocus.data.Building;
 import com.example.classlocus.data.BuildingsRepository;
+import com.google.android.gms.maps.GoogleMap;
+import com.google.android.gms.maps.MapFragment;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.Marker;
+import com.google.android.gms.maps.model.MarkerOptions;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v4.app.NavUtils;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Toast;
-import android.widget.TextView;
 
 public class SubmitBuildingActivity extends Activity {
-	Building building = new Building();
-	BuildingsRepository database = new BuildingsRepository(this);
-
+	
+	BuildingsRepository database;
+	Button button;
+	Marker marker;
+	LatLng coordinates;
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -26,143 +30,85 @@ protected void onCreate(Bundle savedInstanceState) {
 		
 		getActionBar().setDisplayHomeAsUpEnabled(true);
 		getActionBar().setTitle("New Building");
-
-		final Button submit = (Button) findViewById(R.id.submit_button);
-
-		submit.setOnClickListener(new View.OnClickListener() {
+		
+		database = new BuildingsRepository(this);
+		coordinates = new LatLng(44.56718, -123.27852);
+		
+		button = (Button) findViewById(R.id.submit_button);
+	}
+	
+	@Override
+	protected void onResume() {
+		super.onResume();
+		
+		GoogleMap map = ((MapFragment) getFragmentManager().findFragmentById(R.id.submit_map)).getMap();
+		map.setMyLocationEnabled(true);
+		map.setBuildingsEnabled(true);
+		map.setIndoorEnabled(true);
+		
+		map.setOnMapClickListener(new GoogleMap.OnMapClickListener() {
+			@Override
+			public void onMapClick(LatLng point) {
+				GoogleMap map = ((MapFragment) getFragmentManager().findFragmentById(R.id.submit_map)).getMap();
+				
+				if (marker != null) {
+					marker.remove();
+				}
+				
+				marker = map.addMarker(new MarkerOptions().position(point));
+				coordinates = marker.getPosition();
+			}
+		});
+		
+		button.setOnClickListener(new View.OnClickListener() {
 			public void onClick(View v) {
 				final EditText buildingNameText = (EditText) findViewById(R.id.edit_text_building_name);
 				final EditText buildingAbbvText = (EditText) findViewById(R.id.edit_text_abbreviation);
 				final CheckBox checkBox = (CheckBox) findViewById(R.id.checkBox1);
-
-				String buildingName = buildingNameText.getText().toString();
-				String buildingAbbv = buildingAbbvText.getText().toString();
-				building.setName(buildingName);
-				building.setAbbreviation(buildingAbbv);
+				
+				Building building = new Building();
+				building.setName(buildingNameText.getText().toString());
+				building.setAbbreviation(buildingAbbvText.getText().toString());
 				building.setParentId(10);
-				building.setLatLng(44.56718, -123.27852);
-
+				building.setLatLng(coordinates.latitude, coordinates.longitude);
+				
 				if (checkBox.isChecked()) {
 					building.setAccessible(true);
 				} else {
 					building.setAccessible(false);
 				}
-
-				if ((!buildingNameText.getText().toString().matches(""))
-						&& (!buildingAbbvText.getText().toString().matches(""))
-						&& (latitude != 0) && (longitude != 0)) {
-					if (database != null) {
-						long id = database.saveBuilding(building);
-						if (id > 0) {
-							Toast.makeText(SubmitBuildingActivity.this,
-									"Building Added (id: " + id + ")",
-									Toast.LENGTH_SHORT).show();
-						}
-				if (database != null) {
-					TextView textView2 = (TextView) findViewById(R.id.textView2);
+				
+				if ( (building.getName().length() != 0) && (building.getAbbreviation().length() != 0) && (building.getLatLng().length != 0) ) {
 					long id = database.saveBuilding(building);
+					
 					if (id > 0) {
-						textView2.setText("Building Added (id: " + id + ")");
+						Toast.makeText(SubmitBuildingActivity.this, "Added buiding " + building.getName(), Toast.LENGTH_SHORT).show();
+					} else {
+						Toast.makeText(SubmitBuildingActivity.this, "Failed to add building. Ensure you have building name and abbreviation fields filled, and place a marker for building location", Toast.LENGTH_SHORT).show();
 					}
-				} else {
-					Toast.makeText(
-							SubmitBuildingActivity.this,
-							"Failed to add building. Ensure you have building name and abbreviation fields filled, and place a marker for building location",
-							Toast.LENGTH_SHORT).show();
 				}
 			}
 		});
-
-	}
-
-	public boolean onCreateOptionsMenu(Menu menu) {
-		// Inflate the menu; this adds items to the action bar if it is present.
-		getMenuInflater().inflate(R.menu.help_menu, menu);
-		return true;
-	}
-
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-		case android.R.id.home:
-			NavUtils.navigateUpFromSameTask(this);
-			return true;
-		default:
-			return super.onOptionsItemSelected(item);
-		}
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-
-		if (checkPlayServices()) {
-			GoogleMap map = ((MapFragment) getFragmentManager()
-					.findFragmentById(R.id.submitBuildingMap)).getMap();
-			map.setMyLocationEnabled(true);
-			map.setBuildingsEnabled(true);
-			map.setIndoorEnabled(true);
-			
-			map.setOnMapClickListener(new GoogleMap.OnMapClickListener() {
-
-				@Override
-				public void onMapClick(LatLng point) {
-					LatLng coordinates;
-
-					GoogleMap map = ((MapFragment) getFragmentManager()
-							.findFragmentById(R.id.submitBuildingMap)).getMap();
-
-					if (marker != null) {
-						marker.remove();
-					}
-
-					marker = map.addMarker(new MarkerOptions().position(point));
-
-					coordinates = marker.getPosition();
-					latitude = coordinates.latitude;
-					longitude = coordinates.longitude;
-
+		
+		map.setOnMapClickListener(new GoogleMap.OnMapClickListener() {
+			@Override
+			public void onMapClick(LatLng point) {
+				GoogleMap map = ((MapFragment) getFragmentManager().findFragmentById(R.id.submit_map)).getMap();
+				
+				if (marker != null) {
+					marker.remove();
 				}
-			});
-		}
+
+				marker = map.addMarker(new MarkerOptions().position(point));
+				coordinates = marker.getPosition();
+			}
+		});
 	}
 
 	@Override
 	protected void onPause() {
 		super.onPause();
-		GoogleMap map = ((MapFragment) getFragmentManager().findFragmentById(
-				R.id.submitBuildingMap)).getMap();
+		GoogleMap map = ((MapFragment) getFragmentManager().findFragmentById(R.id.submit_map)).getMap();
 		map.setIndoorEnabled(false);
 	}
-
-	private boolean checkPlayServices() {
-		int status = GooglePlayServicesUtil.isGooglePlayServicesAvailable(this);
-
-		if (status != ConnectionResult.SUCCESS) {
-			if (GooglePlayServicesUtil.isUserRecoverableError(status)) {
-				GooglePlayServicesUtil.getErrorDialog(status, this,
-						REQUEST_CODE_RECOVER_PLAY_SERVICES).show();
-			} else {
-				Toast.makeText(this, "This device is not supported.",
-						Toast.LENGTH_SHORT).show();
-				finish();
-			}
-			return false;
-		}
-		return true;
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		switch (requestCode) {
-		case REQUEST_CODE_RECOVER_PLAY_SERVICES:
-			if (resultCode == RESULT_CANCELED) {
-				Toast.makeText(this, "Google Play Services must be installed.",
-						Toast.LENGTH_SHORT).show();
-				finish();
-			}
-			return;
-		default:
-			super.onActivityResult(requestCode, resultCode, data);
-		}
-	}
 }