diff --git a/java/com/basiccalc/slidenerdtut/Skejewels.java b/java/com/basiccalc/slidenerdtut/Skejewels.java
diff --git a/java/com/skejewels/skejewels/EditEvent.java b/java/com/skejewels/skejewels/EditEvent.java
@@ -42,7 +42,7 @@ public class EditEvent  extends ActionBarActivity implements View.OnClickListene
     private Button nextButton, deleteButton;
     private EditText newEventName;
     private Button title;
-    private TextView searchText, requestText, notificationText;
+    private TextView searchText, requestText, notificationText, settingsText;
     private static final String TAG = Skejewels.class.getSimpleName();
 
 

diff --git a/java/com/skejewels/skejewels/EditRepeatsAndPrivacy.java b/java/com/skejewels/skejewels/EditRepeatsAndPrivacy.java
@@ -158,7 +158,7 @@ public void onCancel(DialogInterface arg0) {
         protected Void doInBackground(String... params){
 
             //TODO get day
-            String newEventName1 = newEventName.replaceAll("\\s+", "JambaSlammerCameraManForNothingEverMattered");
+            String newEventName1 = newEventName.replaceAll("\\s+", "JambaSlammerCameraManForNothingEverMattered").replace("&", "and");
             String url_select="http://skejewels.com/Android/SQLEdit.php?id="+eventId+"&eN="+newEventName1+"&sH="+newStartingHour+"&sM="+newStartingMinute +"&eH="+newEndingHour+"&eM="+newEndingMinute+"&eR="+typeOfRepeat+"&eV="+typeOfVisibility;
             Log.d("Fuck That Man", url_select);
 

diff --git a/java/com/skejewels/skejewels/FriendRequests.java b/java/com/skejewels/skejewels/FriendRequests.java
diff --git a/java/com/skejewels/skejewels/FriendsCalendar.java b/java/com/skejewels/skejewels/FriendsCalendar.java
@@ -70,7 +70,7 @@ public class FriendsCalendar extends ActionBarActivity implements View.OnClickLi
   Date date;
   String dateString;
     private Button title;
-    private TextView searchText, requestText, notificationText;
+    private TextView searchText, requestText, notificationText, settingsText;
 
   public void onCreate(Bundle savedInstanceState){
       super.onCreate(savedInstanceState);
@@ -96,6 +96,8 @@ public void onCreate(Bundle savedInstanceState){
       notificationText = (TextView) findViewById(R.id.notification_text);
       notificationText.setOnClickListener(this);
 
+      settingsText = (TextView) findViewById(R.id.setting_text);
+      settingsText.setOnClickListener(this);
 
       searchText = (TextView) findViewById(R.id.search_text);
       searchText.setOnClickListener(this);
@@ -134,6 +136,10 @@ public void onClick(View v) {
               Intent intent4 = new Intent(this, FriendRequests.class);
               startActivity(intent4);
               break;
+            case R.id.setting_text:
+                Intent intent5 = new Intent(this, SettingsActivity.class);
+                startActivity(intent5);
+                break;
 
             case R.id.nextMonthClickable:
                 rows.clear();

diff --git a/java/com/skejewels/skejewels/FriendsIndividualDayActivity.java b/java/com/skejewels/skejewels/FriendsIndividualDayActivity.java
@@ -59,7 +59,7 @@ public class FriendsIndividualDayActivity extends ActionBarActivity implements V
     private int year = 2015;
 
     private Button title;
-    private TextView searchText, requestText, notificationText;
+    private TextView searchText, requestText, notificationText, settingsText;
 
     //BOXES
     LayoutParams firstLayout, otherLayout;//first layout is for the first Box and otherLayout is the layout for all other boxes.
@@ -101,6 +101,9 @@ public void onCreate(Bundle savedInstanceState) {
         title = (Button) findViewById(R.id.homeButton);
         title.setOnClickListener(this);
 
+        settingsText = (TextView) findViewById(R.id.setting_text);
+        settingsText.setOnClickListener(this);
+
         layout = (LinearLayout) findViewById(R.id.EventsLayout);
 
         addBoxes();
@@ -323,6 +326,10 @@ public void onClick(View v) {
                 startActivity(intent);
                 Log.d(TAG, "Worked");
                 break;
+            case R.id.setting_text:
+                Intent intent5 = new Intent(this, SettingsActivity.class);
+                startActivity(intent5);
+                break;
         }
     }
 

diff --git a/java/com/skejewels/skejewels/FriendsIndividualEvent.java b/java/com/skejewels/skejewels/FriendsIndividualEvent.java
diff --git a/java/com/skejewels/skejewels/IndividualDayActivity.java b/java/com/skejewels/skejewels/IndividualDayActivity.java
@@ -5,6 +5,7 @@
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.os.AsyncTask;
@@ -46,6 +47,9 @@ public class IndividualDayActivity extends ActionBarActivity implements View.OnC
     private Toolbar toolbar;
     private static final String TAG = IndividualDayActivity.class.getSimpleName();
 
+    private int userId = 188;
+    public static final String MyPREFERENCES = "MyPrefs" ;
+
     private ArrayList<Integer> ids;
     private ArrayList<String> times;
 
@@ -61,7 +65,7 @@ public class IndividualDayActivity extends ActionBarActivity implements View.OnC
     private LinearLayout layout;
     private LinearLayout.LayoutParams layoutParams, timeLayoutParams;
     private Button title;
-    private TextView searchText, requestText, notificationText;
+    private TextView searchText, requestText, notificationText, settingsText;
 
     private TextView topDate;//date that appears at top of screen.
 
@@ -72,6 +76,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.individual_day_look);
 
+        setId();
+
         ids = new ArrayList<Integer>();
         times = new ArrayList<String>();
 
@@ -102,6 +108,9 @@ protected void onCreate(Bundle savedInstanceState) {
         notificationText = (TextView) findViewById(R.id.notification_text);
         notificationText.setOnClickListener(this);
 
+        settingsText = (TextView) findViewById(R.id.setting_text);
+        settingsText.setOnClickListener(this);
+
         layout = (LinearLayout)findViewById(R.id.EventsLayout);
 
         addBoxes();
@@ -212,9 +221,9 @@ public void addBoxes(){
         public void onClick(View view) {
             TextView box = (TextView) view;
             for (int i = 0; i < ids.size(); i++){
-               if(view.getId() == ids.get(i)){
-                 goToEditActivity(box.getHint().toString(), box.getText().toString(), times.get(i));
-               }
+                if(view.getId() == ids.get(i)){
+                    goToEditActivity(box.getHint().toString(), box.getText().toString(), times.get(i));
+                }
             }
         }
     };
@@ -265,25 +274,25 @@ public void goToEditActivity(String id, String name, String time){
 
     public int getTextTopPadding(){
         int yPosition = 0;
-       switch (lineAmount){
-           case 1:
-            yPosition = 0;
-            break;
-           case 2:
-               yPosition = 0;
-               break;
-           case 3:
-               yPosition = 100;
-               break;
-           case 4:
-               yPosition = 40;
-               break;
-       }
+        switch (lineAmount){
+            case 1:
+                yPosition = 0;
+                break;
+            case 2:
+                yPosition = 0;
+                break;
+            case 3:
+                yPosition = 100;
+                break;
+            case 4:
+                yPosition = 40;
+                break;
+        }
         return yPosition;
     }
     public int getTimeTopPadding(){
-       int yPosition = 0;
-       return 500 + (eventsMade + 570);
+        int yPosition = 0;
+        return 500 + (eventsMade + 570);
     }
     public String wrapEventName(String s){
         StringBuilder sb = new StringBuilder(s);
@@ -299,22 +308,26 @@ public String wrapEventName(String s){
 
     public void onClick(View v) {
         switch (v.getId()){
-          case R.id.homeButton:
-              Intent intent = new Intent(this, Skejewels.class);
-              startActivity(intent);
-              break;
-          case R.id.notification_text:
-              Intent intent3 = new Intent(this, Notifications.class);
-              startActivity(intent3);
-              break;
-          case R.id.search_text:
-              Intent intent2 = new Intent(this, Search.class);
-              startActivity(intent2);
-              break;
-          case R.id.request_text:
-              Intent intent4 = new Intent(this, FriendRequests.class);
-              startActivity(intent4);
-              break;
+            case R.id.homeButton:
+                Intent intent = new Intent(this, Skejewels.class);
+                startActivity(intent);
+                break;
+            case R.id.notification_text:
+                Intent intent3 = new Intent(this, Notifications.class);
+                startActivity(intent3);
+                break;
+            case R.id.search_text:
+                Intent intent2 = new Intent(this, Search.class);
+                startActivity(intent2);
+                break;
+            case R.id.request_text:
+                Intent intent4 = new Intent(this, FriendRequests.class);
+                startActivity(intent4);
+                break;
+            case R.id.setting_text:
+                Intent intent5 = new Intent(this, SettingsActivity.class);
+                startActivity(intent5);
+                break;
         }
     }
 
@@ -333,36 +346,36 @@ public void onCancel(DialogInterface arg0) {
         }
         protected Void doInBackground(String... params){
 
-        String url_select="http://skejewels.com/Android/PrintEventsOfDay.php?Month=" + (month) + "&Day=" + day + "&Year=" + year;
+            String url_select="http://skejewels.com/Android/PrintEventsOfDay.php?UserId=" + userId + "&Month=" + (month) + "&Day=" + day + "&Year=" + year;
 
-        HttpClient httpClient = new DefaultHttpClient();
-        HttpPost httpPost = new HttpPost(url_select);
+            HttpClient httpClient = new DefaultHttpClient();
+            HttpPost httpPost = new HttpPost(url_select);
 
 
-        ArrayList<NameValuePair> param = new ArrayList<NameValuePair>();
+            ArrayList<NameValuePair> param = new ArrayList<NameValuePair>();
 
-        try {
-            httpPost.setEntity(new UrlEncodedFormEntity(param));
+            try {
+                httpPost.setEntity(new UrlEncodedFormEntity(param));
 
-            HttpResponse httpResponse = httpClient.execute(httpPost);
-            HttpEntity httpEntity = httpResponse.getEntity();
+                HttpResponse httpResponse = httpClient.execute(httpPost);
+                HttpEntity httpEntity = httpResponse.getEntity();
 
-                    //read content
-            is =  httpEntity.getContent();
+                //read content
+                is =  httpEntity.getContent();
 
 
 
 
-        } catch (Exception e) {
+            } catch (Exception e) {
 
-            Log.e("log_tag", "Error in http connection " + e.toString());
-            //Toast.makeText(Skejewels.this, "Please Try Again", Toast.LENGTH_LONG).show();
-        }
-        try {
-            BufferedReader br = new BufferedReader(new InputStreamReader(is));
-            StringBuilder sb = new StringBuilder();
-            String line = "";
-            while((line=br.readLine())!=null)
+                Log.e("log_tag", "Error in http connection " + e.toString());
+                //Toast.makeText(Skejewels.this, "Please Try Again", Toast.LENGTH_LONG).show();
+            }
+            try {
+                BufferedReader br = new BufferedReader(new InputStreamReader(is));
+                StringBuilder sb = new StringBuilder();
+                String line = "";
+                while((line=br.readLine())!=null)
                 {
                     sb.append(line + "\n");
                     String[] values = line.split("-?-");
@@ -374,11 +387,11 @@ protected Void doInBackground(String... params){
 
                 Log.d(TAG, "got to here now!!!! " + result);
 
-        } catch (Exception e) {
-            Log.e("log_tag", "Error converting result "+e.toString());
-        }
+            } catch (Exception e) {
+                Log.e("log_tag", "Error converting result "+e.toString());
+            }
 
-        return null;
+            return null;
 
         }
         private int eventNumber = 0;
@@ -408,7 +421,7 @@ protected void onPostExecute(Void v){
         }
     }
 
-   //WHATEVER STUFF.
+    //WHATEVER STUFF.
     public void onFragmentInteraction(View v) {
     }
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -433,4 +446,9 @@ public boolean onTouch(View v, MotionEvent event) {
         return false;
     }
 
+    private void setId() {
+        SharedPreferences sharedPreferences = getSharedPreferences(MyPREFERENCES, Context.MODE_PRIVATE);
+        String defaultValue = "NO ID";
+        userId = Integer.parseInt(sharedPreferences.getString("current_user_id", defaultValue));
+    }
 }
diff --git a/java/com/skejewels/skejewels/IndividualDayAllComments.java b/java/com/skejewels/skejewels/IndividualDayAllComments.java
diff --git a/java/com/skejewels/skejewels/IndividualEventActivity.java b/java/com/skejewels/skejewels/IndividualEventActivity.java
@@ -1,9 +1,11 @@
 package com.skejewels.skejewels;
 
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.os.AsyncTask;
@@ -45,6 +47,8 @@ public class IndividualEventActivity extends ActionBarActivity implements View.O
     private static final String TAG = IndividualDayActivity.class.getSimpleName();
 
     private Toolbar toolbar;
+    public static final String MyPREFERENCES = "MyPrefs" ;
+    private int userId = 188;
     private int numEventId = 0;
     private String eventId = "2";
     private String eventName = "";
@@ -54,7 +58,7 @@ public class IndividualEventActivity extends ActionBarActivity implements View.O
     private TextView eventExplanation, likeAmount, firstCommentName, secondCommentName, firstComment, secondComment, totalCommentAmount;
     private Button likeButton, commentButton, editButton, homeButton;
     private Button title;
-    private TextView searchText, requestText, notificationText;
+    private TextView searchText, requestText, notificationText, settingsText;
 
     public void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
@@ -78,12 +82,16 @@ public void onCreate(Bundle savedInstanceState){
 
         notificationText = (TextView) findViewById(R.id.notification_text);
         notificationText.setOnClickListener(this);
+
+        settingsText = (TextView) findViewById(R.id.setting_text);
+        settingsText.setOnClickListener(this);
+
+        setId();
+
         NavigationDrawerFragment drawerFragment = (NavigationDrawerFragment)
                 getSupportFragmentManager().findFragmentById(R.id.fragment_navigation_drawer);
         drawerFragment.setUp((DrawerLayout) findViewById(R.id.drawer_layout), toolbar);
 
-
-
         Bundle extras = getIntent().getExtras();
         if(extras != null){
             eventId = extras.getString("eventId", "ALMOST ANYTHING");
@@ -102,22 +110,26 @@ public void onCreate(Bundle savedInstanceState){
 
     public void onClick(View v) {
         switch (v.getId()){
-          case R.id.homeButton:
-              Intent intent = new Intent(this, Skejewels.class);
-              startActivity(intent);
-              break;
-          case R.id.notification_text:
-              Intent intent3 = new Intent(this, Notifications.class);
-              startActivity(intent3);
-              break;
-          case R.id.search_text:
-              Intent intent2 = new Intent(this, Search.class);
-              startActivity(intent2);
-              break;
-          case R.id.request_text:
-              Intent intent4 = new Intent(this, FriendRequests.class);
-              startActivity(intent4);
-              break;
+            case R.id.homeButton:
+                Intent intent = new Intent(this, Skejewels.class);
+                startActivity(intent);
+                break;
+            case R.id.notification_text:
+                Intent intent3 = new Intent(this, Notifications.class);
+                startActivity(intent3);
+                break;
+            case R.id.search_text:
+                Intent intent2 = new Intent(this, Search.class);
+                startActivity(intent2);
+                break;
+            case R.id.request_text:
+                Intent intent4 = new Intent(this, FriendRequests.class);
+                startActivity(intent4);
+                break;
+            case R.id.setting_text:
+                Intent intent5 = new Intent(this, SettingsActivity.class);
+                startActivity(intent5);
+                break;
             case R.id.CommentButton:
                 changeIntent.putExtra("eventID", eventId);
                 startActivity(changeIntent);
@@ -126,8 +138,10 @@ public void onClick(View v) {
                 Button button = (Button) v;
                 if (button.getText().toString().equals("Like")) {
                     button.setText("Unlike");
+                    new like().execute();
                 } else {
                     button.setText("Like");
+                    new unlike().execute();
                 }
                 break;
             case R.id.EditButton:
@@ -193,8 +207,6 @@ protected Void doInBackground(String... params){
                 {
                     sb.append(line + "\n");
                     String[] values = line.split("-?-");
-
-
                 }
                 is.close();
                 result=sb.toString();
@@ -217,6 +229,11 @@ protected void onPostExecute(Void v){
                 if(Integer.parseInt(indivs[2]) > 0){
                     new task2().execute();
                 }
+                for(int i = 3; i < indivs.length - 1; i++){
+                    if(Integer.parseInt(indivs[i]) == userId){
+                        likeButton.setText("Unlike");
+                    }
+                }
 
                 this.progressDialog.dismiss();
 
@@ -271,9 +288,6 @@ protected Void doInBackground(String... params){
                 while((line=br.readLine())!=null)
                 {
                     sb.append(line + "\n");
-                    String[] values = line.split("-?-");
-
-
                 }
                 is.close();
                 result=sb.toString();
@@ -293,7 +307,10 @@ protected void onPostExecute(Void v){
                 for(int i = 0; i < indivs.length; i++){
                 }
                 int amountOfComments = Integer.parseInt(indivs[1]);
-                if(amountOfComments >= 1){
+                if(amountOfComments == 1){
+                    makeFirstComment(indivs[indivs.length-4], indivs[indivs.length - 3], indivs[indivs.length - 2]);
+                }
+                if(amountOfComments > 1){
                     makeFirstComment(indivs[indivs.length-7], indivs[indivs.length - 6], indivs[indivs.length - 5]);
                 }
                 if(amountOfComments >= 2){
@@ -302,12 +319,80 @@ protected void onPostExecute(Void v){
                 if(amountOfComments > 2){
                     makeRestOfCommentsLink(Integer.parseInt(indivs[1]));
                 }
-                    //Comment = i
-                    //Commenter Name = i+1
-                    //Commenter Id = i+2
+                //Comment = i
+                //Commenter Name = i+1
+                //Commenter Id = i+2
+
+
+
+                this.progressDialog.dismiss();
+
+            }catch(Exception e){
+                Log.e("log_tag", "Error parsing data "+e.toString());
+            }
+        }
+    }
+
+    class like extends AsyncTask<String, String, Void> {
+        private ProgressDialog progressDialog = new ProgressDialog(IndividualEventActivity.this);
+        InputStream is = null ;
+        String result = "";
+        protected void onPreExecute() {
+            progressDialog.show();
+            progressDialog.setOnCancelListener(new OnCancelListener() {
+                public void onCancel(DialogInterface arg0) {
+                    like.this.cancel(true);
+                }
+            });
+        }
+        protected Void doInBackground(String... params){
+            String newEventName = eventName.replaceAll("\\s+", "JambaSlammerCameraManForNothingEverMattered").replace("&", "and");
+
+            String url_select="http://skejewels.com/Android/AndroidLike.php?eventId=" + eventId + "&eventName=" + newEventName + "&UserId=" + userId;
+
+            HttpClient httpClient = new DefaultHttpClient();
+            HttpPost httpPost = new HttpPost(url_select);
+
+
+            ArrayList<NameValuePair> param = new ArrayList<NameValuePair>();
+
+            try {
+                httpPost.setEntity(new UrlEncodedFormEntity(param));
+
+                HttpResponse httpResponse = httpClient.execute(httpPost);
+                HttpEntity httpEntity = httpResponse.getEntity();
+
+                //read content
+                is =  httpEntity.getContent();
+
+            } catch (Exception e) {
+                Log.e("log_tag", "Error in http connection " + e.toString());
+            }
+            try {
+                BufferedReader br = new BufferedReader(new InputStreamReader(is));
+                StringBuilder sb = new StringBuilder();
+                String line = "";
+                while((line=br.readLine())!=null)
+                {
+                    sb.append(line + "\n");
+                    String[] values = line.split("-?-");
+
+
+                }
+                is.close();
+                result=sb.toString();
+
 
+            } catch (Exception e) {
+                Log.e("log_tag", "Error converting result "+e.toString());
+            }
 
+            return null;
 
+        }
+        private int eventNumber = 0;
+        protected void onPostExecute(Void v){
+            try {
                 this.progressDialog.dismiss();
 
             }catch(Exception e){
@@ -316,6 +401,72 @@ protected void onPostExecute(Void v){
         }
     }
 
+    class unlike extends AsyncTask<String, String, Void> {
+        private ProgressDialog progressDialog = new ProgressDialog(IndividualEventActivity.this);
+        InputStream is = null ;
+        String result = "";
+        protected void onPreExecute() {
+            progressDialog.show();
+            progressDialog.setOnCancelListener(new OnCancelListener() {
+                public void onCancel(DialogInterface arg0) {
+                    unlike.this.cancel(true);
+                }
+            });
+        }
+        protected Void doInBackground(String... params){
+
+            String url_select="http://skejewels.com/Android/AndroidUnlike.php?eventId=" + eventId + "&UserId=" + userId;
+
+            HttpClient httpClient = new DefaultHttpClient();
+            HttpPost httpPost = new HttpPost(url_select);
+
+
+            ArrayList<NameValuePair> param = new ArrayList<NameValuePair>();
+
+            try {
+                httpPost.setEntity(new UrlEncodedFormEntity(param));
+
+                HttpResponse httpResponse = httpClient.execute(httpPost);
+                HttpEntity httpEntity = httpResponse.getEntity();
+
+                //read content
+                is =  httpEntity.getContent();
+
+            } catch (Exception e) {
+                Log.e("log_tag", "Error in http connection " + e.toString());
+            }
+            try {
+                BufferedReader br = new BufferedReader(new InputStreamReader(is));
+                StringBuilder sb = new StringBuilder();
+                String line = "";
+                while((line=br.readLine())!=null)
+                {
+                    sb.append(line + "\n");
+                    String[] values = line.split("-?-");
+
+
+                }
+                is.close();
+                result=sb.toString();
+
+
+            } catch (Exception e) {
+                Log.e("log_tag", "Error converting result "+e.toString());
+            }
+
+            return null;
+
+        }
+        private int eventNumber = 0;
+        protected void onPostExecute(Void v){
+            try {
+                this.progressDialog.dismiss();
+
+            }catch(Exception e){
+                Log.e("log_tag", "Error parsing data "+e.toString());
+            }
+        }
+    }
     public void makeFirstComment(String comment, String commenterName, String commenterId){
         firstComment.setText(comment);
         firstCommentName.setText(commenterName);
@@ -340,4 +491,10 @@ public void onClick(View v) {
         });
     }
 
+    private void setId() {
+        SharedPreferences sharedPreferences = getSharedPreferences(MyPREFERENCES, Context.MODE_PRIVATE);
+        String defaultValue = "NO ID";
+        userId = Integer.parseInt(sharedPreferences.getString("current_user_id", defaultValue));
+    }
+
 }
diff --git a/java/com/skejewels/skejewels/Notifications.java b/java/com/skejewels/skejewels/Notifications.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Build;
@@ -41,11 +42,12 @@
  */
 public class Notifications extends AppCompatActivity implements NavigationDrawerFragment.OnFragmentInteractionListener, View.OnClickListener, View.OnTouchListener{
     private Toolbar toolbar;
+    public static final String MyPREFERENCES = "MyPrefs" ;
     private TextView addBox, nicknameBox, wantsToText;
     private int lastBoxId;
     private RelativeLayout layout;
     private Button title;
-    private TextView searchText, requestText, notificationText;
+    private TextView searchText, requestText, notificationText, settingsText;
     private int  userId = 188;
     private RelativeLayout.LayoutParams acceptButtonParams, declineButtonParams, mainParams, nicknameParams, wantsToParams;
 
@@ -69,6 +71,12 @@ public void onCreate(Bundle savedInstanceState) {
 
         notificationText = (TextView) findViewById(R.id.notification_text);
         notificationText.setOnClickListener(this);
+
+        settingsText = (TextView) findViewById(R.id.setting_text);
+        settingsText.setOnClickListener(this);
+
+        setId();
+
         NavigationDrawerFragment drawerFragment = (NavigationDrawerFragment)
                 getSupportFragmentManager().findFragmentById(R.id.fragment_navigation_drawer);
         drawerFragment.setUp((DrawerLayout) findViewById(R.id.drawer_layout), toolbar);
@@ -94,7 +102,7 @@ public void makeFirstCard(String usersId, String UsersName, String message, Stri
 
     public void makeCard(String usersId, String UsersName, String message, String eventId){
         mainParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
-        mainParams.setMargins((int)pxFromDp(getApplicationContext(), 2),(int)pxFromDp(getApplicationContext(), 10),(int)pxFromDp(getApplicationContext(), 5), 0);
+        mainParams.setMargins((int)pxFromDp(getApplicationContext(), 0),(int)pxFromDp(getApplicationContext(), 10),(int)pxFromDp(getApplicationContext(), 0), 0);
         mainParams.addRule(RelativeLayout.BELOW, lastBoxId);
         mainParams.addRule(RelativeLayout.ALIGN_PARENT_END);
         mainParams.addRule(RelativeLayout.ALIGN_PARENT_START);
@@ -148,6 +156,10 @@ public void onClick(View view) {
                 Intent intent4 = new Intent(this, FriendRequests.class);
                 startActivity(intent4);
                 break;
+            case R.id.setting_text:
+                Intent intent5 = new Intent(this, SettingsActivity.class);
+                startActivity(intent5);
+                break;
         }
     }
 
@@ -264,6 +276,11 @@ protected void onPostExecute(Void v) {
         public void onFragmentInteraction(View v) {
 
     }
+    private void setId() {
+        SharedPreferences sharedPreferences = getSharedPreferences(MyPREFERENCES, Context.MODE_PRIVATE);
+        String defaultValue = "NO ID";
+        userId = Integer.parseInt(sharedPreferences.getString("current_user_id", defaultValue));
+    }
     public boolean onTouch(View view, MotionEvent motionEvent) {
         return false;
     }

diff --git a/java/com/skejewels/skejewels/RepeatsAndPrivacy.java b/java/com/skejewels/skejewels/RepeatsAndPrivacy.java
@@ -1,9 +1,11 @@
 package com.skejewels.skejewels;
 
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -61,6 +63,7 @@ public class RepeatsAndPrivacy extends ActionBarActivity implements View.OnClick
     private String eventName;
     private int startingHour;
     private int startingMinute;
+    public static final String MyPREFERENCES = "MyPrefs" ;
     private int endingHour;
     private int endingMinute;
     private int repeatEndDay;
@@ -71,11 +74,14 @@ public class RepeatsAndPrivacy extends ActionBarActivity implements View.OnClick
     private int month = 6; //which month are we looking at
     private int day = 24;//which day of the month are we looking at
     private int year = 2015;
+    private int userId = 188;
+    private String FirstNames, LastNames, Nickname;
     private Intent restartIntent;
 
     private Button title;
-    private TextView searchText, requestText, notificationText;
+    private TextView searchText, requestText, notificationText, settingsText;
 
+    //UserId AndroidGetUserInfo.php
 
     public void onCreate(Bundle savedInstanceState){
         super.onCreate(savedInstanceState);
@@ -93,9 +99,17 @@ public void onCreate(Bundle savedInstanceState){
         searchText = (TextView) findViewById(R.id.search_text);
         searchText.setOnClickListener(this);
 
+        setId();
+
         requestText = (TextView) findViewById(R.id.request_text);
         requestText.setOnClickListener(this);
 
+        settingsText = (TextView) findViewById(R.id.setting_text);
+        settingsText.setOnClickListener(this);
+
+        settingsText = (TextView) findViewById(R.id.setting_text);
+        settingsText.setOnClickListener(this);
+
         notificationText = (TextView) findViewById(R.id.notification_text);
         notificationText.setOnClickListener(this);
         restartIntent = new Intent(this, Skejewels.class);
@@ -140,7 +154,10 @@ public void onClick(View v) {
               Intent intent4 = new Intent(this, FriendRequests.class);
               startActivity(intent4);
               break;
-
+            case R.id.setting_text:
+                Intent intent5 = new Intent(this, SettingsActivity.class);
+                startActivity(intent5);
+                break;
             case R.id.nextistButton:
                 repeatEndDay = calendar.getDayOfMonth();
                 repeatEndMonth = calendar.getMonth() + 1;
@@ -192,11 +209,11 @@ public void onCancel(DialogInterface arg0) {
         protected Void doInBackground(String... params){
             //TODO get day
             String newEventName = eventName.replaceAll("\\s+", "JambaSlammerCameraManForNothingEverMattered");
-            String url_select="http://skejewels.com/Android/SQLAdd.php?n='" + newEventName +
-            "'&sM=" + month + "&sD=" + day + "&sY=" + year + "&sH=" + startingHour + "&sMi=" + startingMinute +
+            String url_select="http://skejewels.com/Android/SQLAdd.php?n='" + newEventName.replace("&", "and") +
+            "'&sM=" + month + "$UserId=" + userId +  "$Nickname=" + Nickname + "$FirstNames=" + FirstNames +
+            "$LastNames=" + LastNames + "&sD=" + day + "&sY=" + year + "&sH=" + startingHour + "&sMi=" + startingMinute +
             "&eM=" + month + "&eD=" + day + "&eH=" + endingHour   + "&eMi=" + endingMinute +
             "&rT=" + typeOfRepeat + "&eRM=" + repeatEndMonth + "&eRD="+repeatEndDay + "&eRY=" + repeatEndYear + "&v=" + typeOfVisibility;
-            Log.d("Fuck That Man", url_select);
 
             HttpClient httpClient = new DefaultHttpClient();
             HttpPost httpPost = new HttpPost(url_select);
@@ -256,6 +273,76 @@ protected void onPostExecute(Void v){
         }
     }
 
+    class getUserInfo extends AsyncTask<String, String, Void>
+    {
+        private ProgressDialog progressDialog = new ProgressDialog(RepeatsAndPrivacy.this);
+        InputStream is = null ;
+        String result = "";
+        protected void onPreExecute() {
+
+            progressDialog.setMessage("Fetching data...");
+            progressDialog.show();
+            progressDialog.setOnCancelListener(new OnCancelListener() {
+                public void onCancel(DialogInterface arg0) {
+                    getUserInfo.this.cancel(true);
+                }
+            });
+        }
+        protected Void doInBackground(String... params){
+            String newEventName = eventName.replaceAll("\\s+", "JambaSlammerCameraManForNothingEverMattered");
+            String url_select="http://skejewels.com/Android/AndroidGetUserInfo.php?UserId=" + userId;
+
+            HttpClient httpClient = new DefaultHttpClient();
+            HttpPost httpPost = new HttpPost(url_select);
+
+
+            ArrayList<NameValuePair> param = new ArrayList<NameValuePair>();
+
+            try {
+                httpPost.setEntity(new UrlEncodedFormEntity(param));
+
+                HttpResponse httpResponse = httpClient.execute(httpPost);
+                HttpEntity httpEntity = httpResponse.getEntity();
+
+                //read content
+                is =  httpEntity.getContent();
+
+            } catch (Exception e) {
+                Log.e("log_tag", "Error in http connection " + e.toString());
+            }
+            try {
+                BufferedReader br = new BufferedReader(new InputStreamReader(is));
+                StringBuilder sb = new StringBuilder();
+                String line = "";
+                while((line=br.readLine())!=null)
+                {
+                    sb.append(line + "\n");
+                }
+                is.close();
+                result=sb.toString();
+
+            } catch (Exception e) {
+                Log.e("log_tag", "Error converting result "+e.toString());
+            }
+
+            return null;
+
+        }
+        protected void onPostExecute(Void v){
+            try {
+                String[] results = result.split(",");
+                FirstNames = results[0];
+                LastNames = results[1];
+                Nickname = results[2];
+
+                Log.d("log_tag", FirstNames + " " + LastNames + " " + Nickname);
+                this.progressDialog.dismiss();
+            }catch(Exception e){
+                Log.e("log_tag", "Error parsing data "+e.toString());
+            }
+        }
+    }
+
     @Override
     public void onNothingSelected(AdapterView<?> parent) {
 
@@ -271,5 +358,10 @@ public boolean onTouch(View v, MotionEvent event) {
         return false;
     }
 
+    private void setId() {
+        SharedPreferences sharedPreferences = getSharedPreferences(MyPREFERENCES, Context.MODE_PRIVATE);
+        String defaultValue = "NO ID";
+        userId = Integer.parseInt(sharedPreferences.getString("current_user_id", defaultValue));
+    }
 
 }
diff --git a/java/com/skejewels/skejewels/Search.java b/java/com/skejewels/skejewels/Search.java
@@ -5,6 +5,7 @@
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -79,9 +80,11 @@ public class Search extends ActionBarActivity implements View.OnClickListener, N
     private String what;
     private String[] friends;
     private ArrayList<String> ids;
+    public static final String MyPREFERENCES = "MyPrefs" ;
     private ArrayList<Integer> nameIds; //used for onclicklistener
     private RelativeLayout.LayoutParams checkParams, nicknameParams, actualNameParams;
     private int lastNicknameId;
+    private int currId = 188;
     final Context context = this;
 
     private Button title;
@@ -103,6 +106,9 @@ public void onCreate(Bundle savedInstanceState){
 
         notificationText = (TextView) findViewById(R.id.notification_text);
         notificationText.setOnClickListener(this);
+
+        setId();
+
         nameIds = new ArrayList<Integer>();
         eventNameEditor.addTextChangedListener(new TextWatcher() {
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -339,7 +345,7 @@ public void onCancel(DialogInterface arg0) {
         }
         protected Void doInBackground(String... params){
 
-        String url_select="http://skejewels.com/Android/AndroidSearch.php?cId=188&q=" + what.replaceAll("\\s+","%20");
+        String url_select="http://skejewels.com/Android/AndroidSearch.php?cId=" + currId + "&q=" + what.replaceAll("\\s+","%20");
         Log.d("search", url_select);
 
         HttpClient httpClient = new DefaultHttpClient();
@@ -456,4 +462,10 @@ public void onNothingSelected(AdapterView<?> adapterView) {
     public boolean onTouch(View view, MotionEvent motionEvent) {
         return false;
     }
+
+    private void setId() {
+        SharedPreferences sharedPreferences = getSharedPreferences(MyPREFERENCES, Context.MODE_PRIVATE);
+        String defaultValue = "NO ID";
+        currId = Integer.parseInt(sharedPreferences.getString("current_user_id", defaultValue));
+    }
 }
diff --git a/java/com/skejewels/skejewels/SecondClockActivity.java b/java/com/skejewels/skejewels/SecondClockActivity.java
@@ -59,7 +59,7 @@ public class SecondClockActivity extends ActionBarActivity implements View.OnCli
     private int year = 2015;
 
     private Button title;
-    private TextView searchText, requestText, notificationText;
+    private TextView searchText, requestText, notificationText, settingsText;
 
 
     public void onCreate(Bundle savedInstanceState){
@@ -79,6 +79,9 @@ public void onCreate(Bundle savedInstanceState){
         requestText = (TextView) findViewById(R.id.request_text);
         requestText.setOnClickListener(this);
 
+        settingsText = (TextView) findViewById(R.id.setting_text);
+        settingsText.setOnClickListener(this);
+
         notificationText = (TextView) findViewById(R.id.notification_text);
         notificationText.setOnClickListener(this);
         Bundle extras = getIntent().getExtras();
@@ -111,6 +114,10 @@ public void onClick(View v) {
               Intent intent4 = new Intent(this, FriendRequests.class);
               startActivity(intent4);
               break;
+            case R.id.setting_text:
+                Intent intent5 = new Intent(this, SettingsActivity.class);
+                startActivity(intent5);
+                break;
             case R.id.nexterButton:
                 Intent intent8 = new Intent(this, RepeatsAndPrivacy.class);
                  intent8.putExtra("EventName", eventName);

diff --git a/java/com/skejewels/skejewels/SettingsActivity.java b/java/com/skejewels/skejewels/SettingsActivity.java
@@ -0,0 +1,77 @@
+package com.skejewels.skejewels;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.TextView;
+
+import com.basiccalc.slidenerdtut.NavigationDrawerFragment;
+import com.basiccalc.slidenerdtut.R;
+
+/**
+ * Created by joshsparks on 8/16/16.
+ */
+public class SettingsActivity extends ActionBarActivity implements View.OnClickListener, NavigationDrawerFragment.OnFragmentInteractionListener, View.OnTouchListener, AdapterView.OnItemSelectedListener {
+
+    private TextView name, username, email, phoneNumber;
+    private Button logout;
+    private CheckBox privateAccountCheckbox;
+    public static final String MyPREFERENCES = "MyPrefs" ;
+
+    public void onCreate(Bundle savedInstanceState){
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings_page);
+        logout = (Button) findViewById(R.id.LogoutButton);
+        logout.setOnClickListener(this);
+
+        declarations();
+    }
+
+    public void declarations(){
+        name = (TextView) findViewById(R.id.NameText);
+        username = (TextView) findViewById(R.id.UsernameText);
+        email = (TextView) findViewById(R.id.EmailText);
+        phoneNumber = (TextView) findViewById(R.id.PhoneText);
+        logout = (Button) findViewById(R.id.LogoutButton);
+        privateAccountCheckbox = (CheckBox) findViewById(R.id.PublicCheckBox);
+    }
+
+    public void onClick(View v) {
+        switch(v.getId()) {
+            case R.id.LogoutButton:
+               removePreferences();
+            break;
+        }
+    }
+    public void removePreferences(){
+        SharedPreferences sharedPreferences = getSharedPreferences(MyPREFERENCES, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.clear();
+        editor.commit();
+        Intent i = new Intent(getApplicationContext(), SignIn.class);
+        startActivity(i);
+    }
+
+    public void onFragmentInteraction(View v) {
+
+    }
+
+    public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+
+    }
+
+    public void onNothingSelected(AdapterView<?> parent) {
+
+    }
+
+    public boolean onTouch(View v, MotionEvent event) {
+        return false;
+    }
+}
diff --git a/java/com/skejewels/skejewels/SignIn.java b/java/com/skejewels/skejewels/SignIn.java
@@ -1,14 +1,39 @@
 package com.skejewels.skejewels;
 
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
 import com.basiccalc.slidenerdtut.NavigationDrawerFragment;
 import com.basiccalc.slidenerdtut.R;
+import com.basiccalc.slidenerdtut.Skejewels;
+import com.google.android.gms.appindexing.Action;
+import com.google.android.gms.appindexing.AppIndex;
+import com.google.android.gms.common.api.GoogleApiClient;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
 
 /**
  * Created by j80ma_000 on 12/5/2015.
@@ -17,6 +42,9 @@ public class SignIn extends ActionBarActivity implements View.OnClickListener, N
 
     private Button signInButton, signUpButton;
     private EditText Username, Password;
+    private String usernameText, passwordText;
+    private int id = 0;
+    public static final String MyPREFERENCES = "MyPrefs";
 
 
     public void onCreate(Bundle savedInstanceState) {
@@ -25,36 +53,137 @@ public void onCreate(Bundle savedInstanceState) {
 
         signInButton = (Button) findViewById(R.id.SignInButton);
         signUpButton = (Button) findViewById(R.id.SignUpButton);
+        signInButton.setOnClickListener(this);
+        signUpButton.setOnClickListener(this);
 
         Username = (EditText) findViewById(R.id.UsernameField);
         Password = (EditText) findViewById(R.id.PasswordField);
 
-//        nextButton = (Button) findViewById(R.id.nextButton);
-//        nextButton.setOnClickListener(this);
-
+        printId();
 
     }
 
-    @Override
     public void onClick(View v) {
-        switch(v.getId()) {
-          
+        switch (v.getId()) {
+
             case R.id.SignInButton:
-                //new task.execute();
+                getEditTextContents();
+                new task().execute();
                 break;
             case R.id.SignUpButton:
                 //go to sign up page
                 break;
         }
     }
 
-    @Override
+    private void getEditTextContents() {
+        usernameText = Username.getText().toString();
+        passwordText = Password.getText().toString();
+    }
+
+    class task extends AsyncTask<String, String, Void> {
+        private ProgressDialog progressDialog = new ProgressDialog(SignIn.this);
+        InputStream is = null;
+        String result = "";
+
+        protected void onPreExecute() {
+            progressDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
+                public void onCancel(DialogInterface arg0) {
+                    task.this.cancel(true);
+                }
+            });
+        }
+
+        protected Void doInBackground(String... params) {
+
+            String url_select = "http://skejewels.com/Android/SignIn.php?username=" + usernameText + "&password=" + passwordText;
+            Log.d("search", url_select);
+
+            HttpClient httpClient = new DefaultHttpClient();
+            HttpPost httpPost = new HttpPost(url_select);
+
+
+            ArrayList<NameValuePair> param = new ArrayList<NameValuePair>();
+
+            try {
+                httpPost.setEntity(new UrlEncodedFormEntity(param));
+
+                HttpResponse httpResponse = httpClient.execute(httpPost);
+                HttpEntity httpEntity = httpResponse.getEntity();
+
+                //read content
+                is = httpEntity.getContent();
+
+
+            } catch (Exception e) {
+
+                Log.e("log_tag", "Error in http connection " + e.toString());
+                //Toast.makeText(Skejewels.this, "Please Try Again", Toast.LENGTH_LONG).show();
+            }
+            try {
+                BufferedReader br = new BufferedReader(new InputStreamReader(is));
+                StringBuilder sb = new StringBuilder();
+                String line = "";
+                while ((line = br.readLine()) != null) {
+                    sb.append(line + "\n");
+                    String[] values = line.split("-?-");
+                }
+                is.close();
+                result = sb.toString();
+            } catch (Exception e) {
+                Log.e("log_tag", "Error converting result " + e.toString());
+            }
+            return null;
+        }
+
+        private int eventNumber = 0;
+
+        protected void onPostExecute(Void v) {
+            try {
+                String[] resultSplit = result.split(",");
+                if (resultSplit[0].equals("\"Correct")) {
+                    Log.d("s", "correct homie");
+                    id = Integer.parseInt(resultSplit[1]);
+                    saveId();
+                    goToCalendar();
+                }
+                printId();
+            } catch (Exception e) {
+                Log.e("log_tag", "Error parsing data " + e.toString());
+            }
+        }
+    }
+
     public void onFragmentInteraction(View v) {
 
     }
 
-    @Override
+    private void goToCalendar() {
+        Intent intent = new Intent(this, Skejewels.class);
+        startActivity(intent);
+    }
+
+    private void saveId() {
+        SharedPreferences sharedPreferences = getSharedPreferences(MyPREFERENCES, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putString("current_user_id", Integer.toString(id));
+        editor.commit();
+    }
+
+    private void printId() {
+        SharedPreferences sharedPreferences = getSharedPreferences(MyPREFERENCES, Context.MODE_PRIVATE);
+        String defaultValue = "NO ID";
+        String printedId = sharedPreferences.getString("current_user_id", defaultValue);
+        Log.d("s", printedId);
+        try {
+            Log.d("soooo", Integer.parseInt(sharedPreferences.getString("current_user_id", defaultValue)) + " Is this still here?");
+        } catch(Exception e) {
+            Log.d("soooo", e.getStackTrace().toString());
+        }
+    }
+
     public boolean onTouch(View v, MotionEvent event) {
         return false;
     }
+
 }
diff --git a/res/layout/acivity_individual_day_comments.xml b/res/layout/acivity_individual_day_comments.xml
@@ -78,7 +78,7 @@
             android:layout_alignParentEnd="true"
             android:layout_marginTop="0dp"
             android:layout_below="@+id/app_bar"
-            android:layout_above="@+id/editText"
+            android:layout_above="@+id/commentEntry"
             android:fillViewport="false"
             android:focusable="false">
 
@@ -142,8 +142,10 @@
         <EditText
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/editText"
+            android:id="@+id/commentEntry"
             android:hint="Add a comment"
+            android:inputType="textCapSentences"
+            android:imeOptions="actionGo"
             android:textColor="#000000"
             android:backgroundTint="#F1F2F3"
             android:singleLine="false"

diff --git a/res/layout/activity_settings_page.xml b/res/layout/activity_settings_page.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#F1F2F3">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/ThirdLayout">
+
+        <include
+            android:id="@+id/app_bar"
+            layout="@layout/app_bar" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/homeButton"
+            android:layout_above="@+id/EventExplanation"
+            android:layout_centerHorizontal="true"
+            style="?android:attr/borderlessButtonStyle"
+            android:width="0dp"
+            android:height="0px"
+            android:maxWidth="0dp"
+            android:maxHeight="0dp"
+            android:visibility="visible"
+            android:background="@color/primaryColor" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/jewelButton"
+            android:src="@drawable/jewel"
+            android:layout_alignParentTop="true"
+            android:layout_alignRight="@+id/homeButton"
+            android:layout_alignEnd="@+id/homeButton"
+            android:layout_alignLeft="@+id/homeButton"
+            android:layout_alignStart="@+id/homeButton"
+            android:layout_alignBottom="@+id/app_bar" />
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/imageView"
+            android:src="@drawable/ic_lines"
+            android:layout_marginTop="14dp"
+            android:layout_marginLeft="18dp"
+            android:layout_marginStart="18dp"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:paddingTop="2dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="MY ACCOUNT"
+            android:id="@+id/textView7"
+            android:layout_below="@+id/app_bar"
+            android:layout_alignParentStart="true"
+            android:textColor="@color/primaryColor"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp" />
+        <View android:background="@color/primaryColor"
+            android:layout_width = "fill_parent"
+            android:layout_height="2dp"
+            android:layout_below="@+id/textView7"
+            android:layout_alignParentStart="true"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:id="@+id/view" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="Name"
+            android:id="@+id/textView8"
+            android:textColor="#000000"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp"
+            android:layout_below="@+id/textView7"
+            android:layout_alignParentStart="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearance"
+            android:text="Joshua Sparks"
+            android:id="@+id/NameText"
+            android:layout_below="@+id/textView8"
+            android:layout_alignParentStart="true"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp"
+            android:textColor="@color/lightGray" />
+
+        <View android:background="@color/veryLightGray"
+            android:layout_width = "fill_parent"
+            android:layout_height="2dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:id="@+id/view2"
+            android:layout_below="@+id/NameText"
+            android:layout_alignParentStart="true"
+            android:layout_marginTop="5dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="Username"
+            android:id="@+id/textView10"
+            android:textColor="#000000"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp"
+            android:layout_below="@+id/view2"
+            android:layout_alignParentStart="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearance"
+            android:text="JoshuaTaylor8"
+            android:id="@+id/UsernameText"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp"
+            android:textColor="@color/lightGray"
+            android:layout_below="@+id/textView10"
+            android:layout_alignParentStart="true" />
+        <View android:background="@color/veryLightGray"
+            android:layout_width = "fill_parent"
+            android:layout_height="2dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:id="@+id/view3"
+            android:layout_below="@+id/UsernameText"
+            android:layout_alignParentStart="true"
+            android:layout_marginTop="5dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="Email"
+            android:id="@+id/textView12"
+            android:textColor="#000000"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp"
+            android:layout_below="@+id/view3"
+            android:layout_alignParentStart="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearance"
+            android:text="j80mar4@gmail.com"
+            android:id="@+id/EmailText"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp"
+            android:textColor="@color/lightGray"
+            android:layout_below="@+id/textView12"
+            android:layout_alignParentStart="true" />
+
+        <View android:background="@color/veryLightGray"
+            android:layout_width = "fill_parent"
+            android:layout_height="2dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:id="@+id/view4"
+            android:layout_below="@+id/EmailText"
+            android:layout_alignParentStart="true"
+            android:layout_marginTop="5dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="Phone Number"
+            android:id="@+id/textView14"
+            android:textColor="#000000"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp"
+            android:layout_below="@+id/view4"
+            android:layout_alignParentStart="true" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearance"
+            android:text="+1-303-919-7093"
+            android:id="@+id/PhoneText"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp"
+            android:textColor="@color/lightGray"
+            android:layout_below="@+id/textView14"
+            android:layout_alignParentStart="true" />
+
+        <View android:background="@color/veryLightGray"
+            android:layout_width = "fill_parent"
+            android:layout_height="2dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:id="@+id/view5"
+            android:layout_below="@+id/PhoneText"
+            android:layout_alignParentStart="true"
+            android:layout_marginTop="5dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="Public Account"
+            android:id="@+id/textView16"
+            android:textColor="#000000"
+            android:paddingLeft="20dp"
+            android:paddingTop="10dp"
+            android:layout_alignTop="@+id/view5"
+            android:layout_alignParentStart="true" />
+
+        <CheckBox
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/PublicCheckBox"
+            android:checked="false"
+            android:buttonTint="#000000"
+            android:singleLine="false"
+            android:clickable="false"
+            android:elegantTextHeight="false"
+            android:enabled="false"
+            android:focusable="false"
+            android:layout_below="@+id/view5"
+            android:layout_alignParentEnd="true"
+            android:paddingTop="20dp"
+            android:paddingRight="20dp" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Logout"
+            android:id="@+id/LogoutButton"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="30dp"
+            android:background="@color/primaryColor" />
+
+    </RelativeLayout>
+</android.support.v4.widget.DrawerLayout>
diff --git a/res/layout/friend_request.xml b/res/layout/friend_request.xml
@@ -87,8 +87,8 @@ android:paddingTop="2dp" />
             android:layout_marginTop="10dp"
             android:layout_centerHorizontal="true"
             android:elevation="2dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp" />
+            android:layout_marginLeft="0dp"
+            android:layout_marginRight="0dp" />
 
         <TextView
             android:layout_width="wrap_content"

diff --git a/res/layout/notifications.xml b/res/layout/notifications.xml
@@ -87,8 +87,8 @@
                     android:layout_marginTop="10dp"
                     android:layout_centerHorizontal="true"
                     android:elevation="2dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp" />
+                    android:layout_marginLeft="0dp"
+                    android:layout_marginRight="0dp" />
 
                 <TextView
                     android:layout_width="wrap_content"

diff --git a/res/layout/sign_in.xml b/res/layout/sign_in.xml
@@ -42,7 +42,8 @@
             android:textColor="#ffffff"
             android:hint="Username"
             android:backgroundTint="#ffffff"
-            android:textColorHint="#ffffff" />
+            android:textColorHint="#ffffff"
+            android:text="Joshuataylor8" />
 
         <EditText
             android:layout_width="match_parent"
@@ -55,7 +56,8 @@
             android:textColorHint="#ffffff"
             android:textColor="#ffffff"
             android:backgroundTint="#ffffff"
-            android:layout_marginTop="20dp" />
+            android:layout_marginTop="20dp"
+            android:text="funny81" />
 
         <Button
             android:layout_width="match_parent"

diff --git a/res/values/colors.xml b/res/values/colors.xml
@@ -3,5 +3,8 @@
     <color name="primaryColor">#009688</color>
     <color name="primaryColorDark">#00796b</color>
     <color name="accentColor"> #fff176</color>
+    <color name="lightGray">#888888</color>
+    <color name="veryLightGray">#e6e6e6</color>
+    <color name="LightestGray">#d9d9d9</color>
     <color name="text">#000000</color>
 </resources>