diff --git a/res/drawable-hdpi/parking_map.png b/res/drawable-hdpi/parking_map.png
new file mode 100644
index 0000000..524ae62
Binary files /dev/null and b/res/drawable-hdpi/parking_map.png differ
diff --git a/res/layout/activity_alerts.xml b/res/layout/activity_alerts.xml
index 246c9a7..852a1c3 100644
--- a/res/layout/activity_alerts.xml
+++ b/res/layout/activity_alerts.xml
@@ -2,15 +2,19 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical" 
-    android:background="#7d9a43">
+    android:background="#7d9a43"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin">
 
     <TextView
         android:id="@+id/alerts_label_alerts_to_receive"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/alerts_label_alerts_to_receive"
-        android:textColor="@color/black" 
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/black" />
 
     <CheckBox
         android:id="@+id/alerts_check_timed"
@@ -38,9 +42,10 @@
 
     <Button
         android:id="@+id/getAlertsButton"
-        android:layout_width="wrap_content"
+        android:layout_width="186dp"
         android:layout_height="wrap_content"
-        android:textColor="@color/black" 
-        android:text="@string/button_get_alerts" />
+        android:gravity="left|center_vertical"
+        android:text="@string/button_get_alerts"
+        android:textColor="@color/black" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index d9f0d74..39795b7 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -57,7 +57,8 @@
             android:layout_span="1"
             android:layout_weight="1"
             android:text="@string/button_clear_alerts"
-            android:textColor="@color/black" />
+            android:textColor="@color/black" 
+            android:gravity="left|center_vertical"/>
 
         <Button
             android:id="@+id/refreshAlertsButton"
@@ -66,6 +67,7 @@
             android:layout_height="wrap_content"
             android:layout_span="1"
             android:layout_weight="1"
+            android:gravity="left|center_vertical"
             android:text="@string/button_refresh_alerts"
             android:textColor="@color/black" />
     </TableRow>
diff --git a/res/layout/activity_parking.xml b/res/layout/activity_parking.xml
index 9e2e5f9..a12216e 100644
--- a/res/layout/activity_parking.xml
+++ b/res/layout/activity_parking.xml
@@ -1,122 +1,183 @@
-<RelativeLayout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android1="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#7d9a43"
-    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=".Parking" >
-<TextView
-    android1:id="@+id/textViewSelectLot"
-    android1:layout_width="wrap_content"
-    android1:layout_height="wrap_content"
-    android1:layout_alignParentLeft="true"
-    android1:layout_alignParentTop="true"
-    android1:layout_marginTop="5dp"
-    android1:text="@string/title_parking_selection"
-    android1:textAppearance="?android:attr/textAppearanceSmall"
-    android1:textColor="@color/black" />
-    
-<RadioGroup
-    android1:id="@+id/radioGroup1"
-    android1:layout_width="wrap_content"
-    android1:layout_height="wrap_content"
-    android1:layout_alignLeft="@+id/textViewSelectLot"
-    android1:layout_below="@+id/textViewSelectLot"
-    android1:layout_marginTop="10dp" >
-
-    <RadioButton
-        android:id="@+id/radioButtonPurple"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/purple_lot"
-        android:textColor="@color/black"
-        android1:textColorLink="@color/pressed_unccgameday"
-        android:onClick="onRadioButtonClick" />
-   
-    <RadioButton
-        android1:id="@+id/radioButtonGreen"
-        android1:layout_width="wrap_content"
-        android1:layout_height="wrap_content"
-        android1:text="@string/green_lot"
-        android1:textColor="@color/black"
-        android:onClick="onRadioButtonClick" />
-
-
-    <RadioButton
-        android1:id="@+id/radioButtonSilver"
-        android1:layout_width="wrap_content"
-        android1:layout_height="wrap_content"
-        android1:text="@string/silver_lot"
-        android1:textColor="@color/black"
-        android:onClick="onRadioButtonClick" />
-
-    <RadioButton
-        android1:id="@+id/radioButtonYellow"
-        android1:layout_width="wrap_content"
-        android1:layout_height="wrap_content"
-        android1:text="@string/yellow_lot"
-        android1:textColor="@color/black"
-        android:onClick="onRadioButtonClick" />
-
-    <RadioButton
-        android1:id="@+id/radioButtonBlue"
-        android1:layout_width="wrap_content"
-        android1:layout_height="wrap_content"
-        android1:text="@string/blue_lot"
-        android1:textColor="@color/black"
-        android:onClick="onRadioButtonClick" />
-
-    <RadioButton
-        android1:id="@+id/radioButtonBlack"
-        android1:layout_width="wrap_content"
-        android1:layout_height="wrap_content"
-        android1:text="@string/black_lot"
-        android1:textColor="@color/black"
-        android:onClick="onRadioButtonClick" />
-
-    <RadioButton
-        android1:id="@+id/radioButtonGold"
-        android1:layout_width="wrap_content"
-        android1:layout_height="wrap_content"
-        android1:text="@string/gold_lot"
-        android1:textColor="@color/black"
-        android:onClick="onRadioButtonClick" />
-
-    <RadioButton
-        android1:id="@+id/radioButtonWhite"
-        android1:layout_width="wrap_content"
-        android1:layout_height="wrap_content"
-        android1:text="@string/white_lot"
-        android1:textColor="@color/black"
-        android:onClick="onRadioButtonClick" />
-
-    <RadioButton
-        android1:id="@+id/radioButtonPink"
-        android1:layout_width="wrap_content"
-        android1:layout_height="wrap_content"
-        android1:text="@string/pink_lot"
-        android1:textColor="@color/black"
-        android:onClick="onRadioButtonClick" />
-
-    <RadioButton
-        android1:id="@+id/radioButtonRed"
-        android1:layout_width="wrap_content"
-        android1:layout_height="wrap_content"
-        android1:text="@string/red_lot"
-        android1:textColor="@color/black"
-        android:onClick="onRadioButtonClick" />
-    
-    <RadioButton
-         android1:id="@+id/radioButtonOrange"
-         android1:layout_width="wrap_content"
-         android1:layout_height="wrap_content"
-         android1:text="@string/orange_lot"
-         android1:textColor="@color/black"
-         android:onClick="onRadioButtonClick" />
-</RadioGroup>
-
+<RelativeLayout xmlns:tools="http://schemas.android.com/tool"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#7d9a43"
+    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=".Parking" >
+
+    <TextView
+        android:id="@+id/textViewSelectLot"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginTop="5dp"
+        android:text="@string/title_parking_selection"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="@color/black" />
+
+    <Button
+        android:id="@+id/buttonSilver"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="85dp"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/buttonRed"
+        android:layout_below="@+id/buttonRed"
+        android:layout_centerHorizontal="true"
+        android:gravity="left|center_vertical"
+        android:text="@string/silver_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonOrange"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="85dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/buttonBlack"
+        android:layout_alignBottom="@+id/buttonBlack"
+        android:layout_centerHorizontal="true"
+        android:gravity="left|center_vertical"
+        android:text="@string/orange_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonRed"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="85dp"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/buttonPurple"
+        android:layout_below="@+id/buttonPurple"
+        android:gravity="left|center_vertical"
+        android:text="@string/red_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonPurple"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="85dp"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/buttonGold"
+        android:layout_toLeftOf="@+id/buttonPink"
+        android:gravity="left|center_vertical"
+        android:text="@string/purple_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <ImageView
+        android:id="@+id/imageView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/textViewSelectLot"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="18dp"
+        android:adjustViewBounds="true"
+        android:contentDescription="@string/parking_map"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:scaleType="fitCenter"
+        android:src="@drawable/parking_map" />
+
+    <Button
+        android:id="@+id/buttonWhite"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="85dp"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/buttonPurple"
+        android:layout_alignLeft="@+id/buttonPink"
+        android:gravity="left|center_vertical"
+        android:text="@string/white_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonPink"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="85dp"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/buttonRed"
+        android:layout_toRightOf="@+id/buttonOrange"
+        android:gravity="left|center_vertical"
+        android:text="@string/pink_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonYellow"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="85dp"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/buttonSilver"
+        android:layout_alignLeft="@+id/buttonPink"
+        android:gravity="left|center_vertical"
+        android:text="@string/yellow_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonBlack"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="85dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/imageView1"
+        android:layout_marginTop="49dp"
+        android:layout_toLeftOf="@+id/buttonOrange"
+        android:gravity="left|center_vertical"
+        android:text="@string/black_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonBlue"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="85dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/buttonBlack"
+        android:layout_toLeftOf="@+id/buttonOrange"
+        android:gravity="left|center_vertical"
+        android:text="@string/blue_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonGold"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="85dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/buttonBlue"
+        android:layout_toLeftOf="@+id/buttonOrange"
+        android:gravity="left|center_vertical"
+        android:text="@string/gold_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
+    <Button
+        android:id="@+id/buttonGreen"
+        style="?android:attr/buttonStyleSmall"
+        android:layout_width="85dp"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/buttonGold"
+        android:layout_toLeftOf="@+id/buttonOrange"
+        android:gravity="left|center_vertical"
+        android:text="@string/green_lot"
+        android:textColor="@color/black"
+        android:textSize="12sp"
+        android:textStyle="bold" />
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_registration.xml b/res/layout/activity_registration.xml
index b1526c8..2d31e7c 100644
--- a/res/layout/activity_registration.xml
+++ b/res/layout/activity_registration.xml
@@ -11,24 +11,24 @@
     tools:ignore="Overdraw" >
 
     <TextView
-        android:id="@+id/studentFirstName"
+        android:id="@+id/studentName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_marginTop="10dp"
-        android:text="@string/student_first_name"
+        android:text="@string/student_name"
         android:textAllCaps="false"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textColor="@color/black" />
+        android:textColor="@color/black" 
+        android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <TextView
-        android:id="@+id/studentLastName"
+        android:id="@+id/studentOrganization"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:layout_below="@+id/studentFirstName"
+        android:layout_below="@+id/studentName"
         android:layout_marginTop="40dp"
-        android:text="@string/student_last_name"
+        android:text="@string/organization_check_in"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="@color/black" />
 
@@ -37,7 +37,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:layout_below="@+id/studentLastName"
+        android:layout_below="@+id/studentOrganization"
         android:layout_marginTop="40dp"
         android:text="@string/section_number"
         android:textColor="@color/black" 
@@ -55,11 +55,11 @@
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <EditText
-        android:id="@+id/editStudentFirstName"
+        android:id="@+id/editStudentName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:layout_below="@+id/studentFirstName"
+        android:layout_below="@+id/studentName"
         android:ems="10"
         android:inputType="textPersonName"
         android:textColor="@color/black"
@@ -70,11 +70,11 @@
     </EditText>
 
     <EditText
-        android:id="@+id/editStudentLastName"
+        android:id="@+id/editOrganizationName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:layout_below="@+id/studentLastName"
+        android:layout_below="@+id/studentOrganization"
         android:ems="10"
         android:inputType="text"
         android:textColor="@color/black"
@@ -100,12 +100,32 @@
         android:inputType="number"
         android:textColor="@color/black" />
 
+    <TextView
+        android:id="@+id/addComment"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/editRowNumber"
+        android:layout_below="@+id/editRowNumber"
+        android:layout_marginTop="14dp"
+        android:text="@string/registration_comments"
+        android:textColor="@color/black" />
+
+    <EditText
+        android:id="@+id/editComments"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/addComment"
+        android:layout_below="@+id/addComment"
+        android:ems="10"
+        android:inputType="textMultiLine"
+        android:textColor="@color/black" />
+
     <CheckBox
         android:id="@+id/checkBoxBroadcastInfo"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/editRowNumber"
-        android:layout_below="@+id/editRowNumber"
+        android:layout_alignLeft="@+id/editComments"
+        android:layout_below="@+id/editComments"
         android:layout_marginTop="20dp"
         android:text="@string/check_box_broadcast"
         android:textColor="@color/black" />
@@ -118,7 +138,6 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="15dp"
         android:text="@string/button_register"
-        android:textColor="@color/black"
-        android:onClick="onClick" />
+        android:textColor="@color/black" />
 
 </RelativeLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d779f10..7a8c50b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,8 +20,7 @@
     <string name="preferences_file">GamedayPreferences</string>
     <string name="server_hostname">uncc-gameday.no-ip.org</string> 
     <string name="student_check_in">Student Check-In</string>
-    <string name="student_first_name">First Name:</string>
-    <string name="student_last_name">Last Name:</string>
+    <string name="student_name">Full Name:</string>
     <string name="section_number">Section:</string>
     <string name="row_number">Row:</string>
     <string name="check_box_broadcast">Broadcast Information</string>
diff --git a/src/com/uncc/gameday/activities/Parking.java b/src/com/uncc/gameday/activities/Parking.java
index 61baccc..8d0b9cf 100644
--- a/src/com/uncc/gameday/activities/Parking.java
+++ b/src/com/uncc/gameday/activities/Parking.java
@@ -31,7 +31,7 @@ public class Parking extends MenuActivity {
 	 *
 	 * @param v the v
 	 */
-	public void onRadioButtonClick(View v) {
+	public void onButtonClick(View v) {
 		// Set up some initial fragment boilerplate
 		FragmentManager fm = this.getFragmentManager();
 		LotViewFragment f = new LotViewFragment();
@@ -39,37 +39,37 @@ public class Parking extends MenuActivity {
 		
 		// Get the actual parking lot we will load (store as a String)
 		switch (v.getId()) {
-			case R.id.radioButtonBlack:
+			case R.id.buttonBlack:
 				fBundle.putCharArray("CHOICE", ParkingChoice.BLACK.getValue().toCharArray());
 				break;
-			case R.id.radioButtonBlue:
+			case R.id.buttonBlue:
 				fBundle.putCharArray("CHOICE", ParkingChoice.BLUE.getValue().toCharArray());
 				break;
-			case R.id.radioButtonGold:
+			case R.id.buttonGold:
 				fBundle.putCharArray("CHOICE", ParkingChoice.GOLD.getValue().toCharArray());
 				break;
-			case R.id.radioButtonGreen:
+			case R.id.buttonGreen:
 				fBundle.putCharArray("CHOICE", ParkingChoice.GREEN.getValue().toCharArray());
 				break;
-			case R.id.radioButtonOrange:
+			case R.id.buttonOrange:
 				fBundle.putCharArray("CHOICE", ParkingChoice.ORANGE.getValue().toCharArray());
 				break;
-			case R.id.radioButtonPink:
+			case R.id.buttonPink:
 				fBundle.putCharArray("CHOICE", ParkingChoice.PINK.getValue().toCharArray());
 				break;
-			case R.id.radioButtonPurple:
+			case R.id.buttonPurple:
 				fBundle.putCharArray("CHOICE", ParkingChoice.PURPLE.getValue().toCharArray());
 				break;
-			case R.id.radioButtonRed:
+			case R.id.buttonRed:
 				fBundle.putCharArray("CHOICE", ParkingChoice.RED.getValue().toCharArray());
 				break;
-			case R.id.radioButtonSilver:
+			case R.id.buttonSilver:
 				fBundle.putCharArray("CHOICE", ParkingChoice.SILVER.getValue().toCharArray());
 				break;
-			case R.id.radioButtonWhite:
+			case R.id.buttonWhite:
 				fBundle.putCharArray("CHOICE", ParkingChoice.WHITE.getValue().toCharArray());
 				break;
-			case R.id.radioButtonYellow:
+			case R.id.buttonYellow:
 				fBundle.putCharArray("CHOICE", ParkingChoice.YELLOW.getValue().toCharArray());
 				break;
 		}