diff --git a/res/layout/activity_parking.xml b/res/layout/activity_parking.xml
index f48f56b..9e2e5f9 100644
--- a/res/layout/activity_parking.xml
+++ b/res/layout/activity_parking.xml
@@ -32,7 +32,7 @@
         android:id="@+id/radioButtonPurple"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/puple_lot"
+        android:text="@string/purple_lot"
         android:textColor="@color/black"
         android1:textColorLink="@color/pressed_unccgameday"
         android:onClick="onRadioButtonClick" />
diff --git a/res/layout/activity_registration.xml b/res/layout/activity_registration.xml
index 64b3e30..2d31e7c 100644
--- a/res/layout/activity_registration.xml
+++ b/res/layout/activity_registration.xml
@@ -7,14 +7,15 @@
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:background="#7d9a43"
-    tools:context=".Registration" >
+    tools:context=".Registration"
+    tools:ignore="Overdraw" >
 
     <TextView
         android:id="@+id/studentName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
-        android:layout_marginTop="26dp"
+        android:layout_marginTop="10dp"
         android:text="@string/student_name"
         android:textAllCaps="false"
         android:textColor="@color/black" 
@@ -26,10 +27,10 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/studentName"
-        android:layout_marginTop="72dp"
-        android:textColor="@color/black" 
-        android:text="@string/student_organization"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
+        android:layout_marginTop="40dp"
+        android:text="@string/organization_check_in"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="@color/black" />
 
     <TextView
         android:id="@+id/sectionNumber"
@@ -37,7 +38,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/studentOrganization"
-        android:layout_marginTop="72dp"
+        android:layout_marginTop="40dp"
         android:text="@string/section_number"
         android:textColor="@color/black" 
         android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -48,7 +49,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/sectionNumber"
-        android:layout_marginTop="72dp"
+        android:layout_marginTop="40dp"
         android:text="@string/row_number"
         android:textColor="@color/black" 
         android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -64,7 +65,8 @@
         android:textColor="@color/black"
         android:textColorLink="@color/black" >
 
-        <requestFocus />
+        <requestFocus android:layout_height="match_parent" />
+
     </EditText>
 
     <EditText
@@ -98,24 +100,44 @@
         android:inputType="number"
         android:textColor="@color/black" />
 
-    <Button
-        android:id="@+id/buttonSave"
+    <TextView
+        android:id="@+id/addComment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginLeft="18dp"
-        android:textColor="@color/black" 
-        android:layout_toRightOf="@+id/checkBoxBroadcastInfo"
-        android:text="@string/button_save" />
+        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="wrap_content"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/buttonSave"
-        android:layout_alignBottom="@+id/buttonSave"
-        android:layout_alignParentLeft="true"
-        android:textColor="@color/black" 
-        android:text="@string/check_box_broadcast" />
+        android:layout_alignLeft="@+id/editComments"
+        android:layout_below="@+id/editComments"
+        android:layout_marginTop="20dp"
+        android:text="@string/check_box_broadcast"
+        android:textColor="@color/black" />
+
+    <Button
+        android:id="@+id/buttonRegister"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="15dp"
+        android:text="@string/button_register"
+        android:textColor="@color/black" />
 
 </RelativeLayout>
diff --git a/res/layout/activity_search_rsvp.xml b/res/layout/activity_search_rsvp.xml
new file mode 100644
index 0000000..1397c28
--- /dev/null
+++ b/res/layout/activity_search_rsvp.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tool"
+    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"
+  >
+
+    <SearchView
+        android:id="@+id/searchView1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="18dp"
+        android:background="#b29600"
+        android:queryHint="@string/search_hint"
+        android:inputType="text" >
+    </SearchView>
+
+    <TextView
+        android:id="@+id/textView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/searchView1"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="60dp"
+        android:text="@string/search_text"
+        android:textColor="@color/black"
+        android:textStyle="italic"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 90aa4c8..3558709 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,7 +21,7 @@
     <string name="server_hostname">uncc-gameday.no-ip.org</string> 
     <string name="student_check_in">Student Check-In</string>
     <string name="student_name">Student Name:</string>
-    <string name="student_organization">Organization:</string>
+    <string name="student_organization">Organization Name:</string>
     <string name="section_number">Section:</string>
     <string name="row_number">Row:</string>
     <string name="check_box_broadcast">Broadcast Information</string>
@@ -31,7 +31,7 @@
     <string name="organization_comments">Comments:</string>
     <string name="registration_view_check_ins">View Check-In List</string>
     <string name="button_save">Save</string>
-    <string name="title_parking_selection">Please Select a Parking Lot</string>
+    <string name="title_parking_selection">Select a Parking Lot</string>
     <string name="button_get_alerts">Get Alerts</string>
     <string name="select_university_alerts">University Alerts</string>
     <string name="select_organization_alerts">Organization Alerts</string>
@@ -44,17 +44,17 @@
     <string name="silver_lot">Silver Lot</string>
     <string name="orange_lot">Orange Lot</string>
     <string name="yellow_lot">Yellow Lot</string>
-    <string name="puple_lot">Purple Lot</string>
+    <string name="purple_lot">Purple Lot</string>
     <string name="pink_lot">Pink Lot</string>
     <string name="white_lot">White Lot</string>
     <string name="gold_lot">Gold Lot</string>
     <string name="title_enter_location">Enter a city:</string>
-
     <string name="button_clear_parking_choices">Clear Selections</string>
     <string name="button_get_lot_info">Get Parking Info</string>
+    <string name="button_register">Register</string>
+    <string name="registration_comments">Comments:</string>
+    <string name="parking_map">Parking Map</string>
+    <string name="search_hint">Enter and Organization/Person:</string>
+    <string name="search_text">Find who else is attending the UNCC football game! \n \nEnter the name of a person or organization into the search bar above.</string>  
     <string name="button_refresh_alerts">Refresh Alerts</string>
-        
-     
-    
-
 </resources>
diff --git a/src/com/uncc/gameday/activities/Registration.java b/src/com/uncc/gameday/activities/Registration.java
index 031ed77..f14e3d8 100644
--- a/src/com/uncc/gameday/activities/Registration.java
+++ b/src/com/uncc/gameday/activities/Registration.java
@@ -1,23 +1,68 @@
 package com.uncc.gameday.activities;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.TextView;
 
 import com.uncc.gameday.R;
 
-
-// TODO: Auto-generated Javadoc
 /**
  * The Class Registration.
  */
-public class Registration extends MenuActivity {
+public class Registration extends MenuActivity implements android.content.DialogInterface.OnClickListener {
 
 	/* (non-Javadoc)
 	 * @see com.uncc.gameday.activities.MenuActivity#onCreate(android.os.Bundle)
 	 */
+	
+	private Button b;
+	private TextView t;
+	
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_registration);
+		b=(Button)findViewById(R.id.buttonRegister);
+        b.setOnClickListener((OnClickListener) this);
+        
+        t=(TextView)findViewById(R.id.buttonRegister);
 
 	}
-}	
+	
+	public void onClick(View v) {
+	
+		AlertDialog ad = new AlertDialog.Builder(this)
+		.setMessage("Are you ready to register with UNCC GAME DAY?")
+		.setTitle("Confirmation")
+		.setPositiveButton("Yes", this)
+		.setNegativeButton("No", this)
+		.setNeutralButton("Edit", this)
+		.setCancelable(false)
+		.create();
+		
+		ad.show();
+	}
+
+	public void onClick(DialogInterface dialog, int which) {
+	
+		switch(which){
+		case DialogInterface.BUTTON_POSITIVE: // yes
+			t.setText("Your registration has been accepted.  Welcome!");
+			break;
+		case DialogInterface.BUTTON_NEGATIVE: // no
+			t.setText("You may come back and register at amy time.");
+			break;
+		case DialogInterface.BUTTON_NEUTRAL: // neutral
+			t.setText("Please correct any errors and select REGISTER.");
+			break;
+		default:
+			// nothing
+			break;
+		}
+	}
+}