diff --git a/res/layout/activity_goal_survey.xml b/res/layout/activity_goal_survey.xml
index eaf3cd4..003d8e9 100644
--- a/res/layout/activity_goal_survey.xml
+++ b/res/layout/activity_goal_survey.xml
@@ -23,11 +23,18 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="120dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
 		android:id="@+id/day"
         android:layout_below="@+id/dayQuality"
+        android:orientation="horizontal"
 		 >
+		 
+    <RelativeLayout 
+        android:id="@+id/Feeling1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" 
+        >
 
             <ImageButton
     android:id="@+id/ImageButtonG"
@@ -37,6 +44,23 @@
     android:background="@color/white"
     android:onClick="onClickGoal" />
             
+             <TextView
+                 android:id="@+id/Happy"
+                 android:layout_width="wrap_content"
+                 android:layout_height="wrap_content"
+                 android:layout_alignParentBottom="true"
+                 android:layout_below="@+id/ImageButtonG"
+                 android:paddingLeft="19dp"
+                 android:text="@string/Happy"
+                 android:textSize="20sp" />
+            
+     </RelativeLayout>
+     
+    <RelativeLayout 
+        android:id="@+id/Feeling2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+            
             <ImageButton
     android:id="@+id/ImageButtonR"
     android:layout_width="100dp"
@@ -45,26 +69,45 @@
 	android:background="@color/white"
     android:onClick="onClickGoal" />
             
+            <TextView
+                android:id="@+id/Drowsy"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_below="@+id/ImageButtonR"
+                android:paddingLeft="20dp"
+                android:text="@string/Drowsy"
+                android:textSize="19sp" />
+            
+   </RelativeLayout>
+   
+     <RelativeLayout 
+        android:id="@+id/Feeling3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+            
+            <TextView 
+                android:id="@+id/Sleepy"
+                android:layout_width="wrap_content" 
+                android:layout_height="wrap_content"
+                android:paddingLeft="20dp"
+                android:layout_below="@+id/ImageButtonB"
+                android:text="@string/Sleepy"
+                android:textSize="19sp" />
+
             <ImageButton
-    android:id="@+id/ImageButtonB"
-    android:layout_width="100dp"
-    android:layout_height="100dp"
-    android:src="@drawable/b_ico_small" 
-    android:background="@color/white"
-    android:onClick="onClickGoal" />
+                android:id="@+id/ImageButtonB"
+                android:layout_width="100dp"
+                android:layout_height="100dp"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
+                android:background="@color/white"
+                android:onClick="onClickGoal"
+                android:src="@drawable/b_ico_small" />
+            
+          </RelativeLayout>
 
         </LinearLayout>
-        
-            <TextView
-        android:id="@+id/deviationTitle"
-        android:layout_width="match_parent"
-        android:layout_height="100dp"
-        android:gravity="center"
-        android:text="Why did you miss your goal?"
-                android:layout_below="@+id/day"
-        android:textColor="#33b5e5"
-        android:textSize="25sp"
-		 />
     
         <RelativeLayout
         android:layout_width="280dp"
@@ -157,7 +200,19 @@
         android:gravity="center"
         android:layout_below="@+id/deviationReasons"        
         android:onClick="onClickSubmit"/>
-            
+
+	<TextView
+	    android:id="@+id/deviationTitle"
+	    android:layout_width="match_parent"
+	    android:layout_height="100dp"
+	    android:layout_alignParentLeft="true"
+	    android:layout_below="@+id/day"
+	    android:layout_marginTop="18dp"
+	    android:paddingTop="10dp"
+	    android:gravity="center"
+	    android:text="Why did you miss your goal?"
+	    android:textColor="#33b5e5"
+	    android:textSize="25sp" />
 
 </RelativeLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 85cd20f..64d5acf 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -82,6 +82,9 @@
     <string name="getMoreSleepGoalButton">Get More Sleep</string>
     <string name="title_activity_survey">SurveyActivity</string>
     <string name="title_activity_goal_survey">GoalSurveyActivity</string>
+    <string name="Happy">Happy</string>
+    <string name="Drowsy">Drowsy</string>
+    <string name="Sleepy">Sleepy</string>
 
     <string name="app_name">Badge</string>
     <string name="action_settings">Settings</string>
diff --git a/src/com/example/ds/DonutChartView.java b/src/com/example/ds/DonutChartView.java
index 7a5b92f..df3f0bd 100644
--- a/src/com/example/ds/DonutChartView.java
+++ b/src/com/example/ds/DonutChartView.java
@@ -1,8 +1,10 @@
 package com.example.ds;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.TreeMap;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -12,6 +14,7 @@
 import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.PointF;
+import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Typeface;
 import android.util.AttributeSet;
@@ -62,6 +65,8 @@ public String toString() {
     private final TreeMap<Integer, ArcInfo> mArcInfos = new TreeMap<Integer, ArcInfo>();
     private int[] mBuckets = {0};
     
+    private ArrayList<RectF> DonutSpace=new ArrayList<RectF>();
+    
     public DonutChartView(Context context) {
         super(context);
         setOnTouchListener(this);
@@ -90,7 +95,8 @@ public DonutChartView(Context context, AttributeSet set) {
         }
     }
     
-    @Override
+    @SuppressLint("DrawAllocation")
+	@Override
     public void onDraw(Canvas canvas) {
         float size;
         float pivotStartPoint = -90;
@@ -128,6 +134,12 @@ public void onDraw(Canvas canvas) {
                     float outerRadiusOffset = 12.5f * mMult;
                     RectF outerDonutRect = new RectF(xTop + size - outerRadiusOffset, yTop + size - outerRadiusOffset,
                             xBottom - size + outerRadiusOffset, yBottom - size + outerRadiusOffset);
+                    System.out.println("The top is"+outerDonutRect.top);
+                    System.out.println("The bottom is "+outerDonutRect.bottom);
+                    System.out.println("The left is "+outerDonutRect.left);
+                    System.out.println("The right is "+outerDonutRect.right);
+                    DonutSpace.add(outerDonutRect);
+                    
                     textPath.addArc(outerDonutRect, pivotStartPoint, arcLength);
                     // Draw an arc in normal size in highlighted color
                     
@@ -142,6 +154,8 @@ public void onDraw(Canvas canvas) {
                     mPaint.setStrokeWidth(125 * mMult);
 
                     canvas.drawArc(outerDonutRect, pivotStartPoint + 1, arcLength - 2, false, mPaint);
+                    
+                    
 
                     
                 } else {
@@ -204,13 +218,74 @@ public void onDraw(Canvas canvas) {
     
     @Override
     public boolean onTouch(View view, MotionEvent event) {
+    	
+    	int index=-1;
+    	if (event.getAction() == MotionEvent.ACTION_DOWN)  {
+    		
+    		float x=event.getX();
+        	float y=event.getY();
+        	System.out.println("X= "+x+","+"Y= "+y);
+        	
+    	  for(int i=0; i<DonutSpace.size();i++){
+    		
+    		if(DonutSpace.get(i).contains(x,y)){
+    			
+    			index=i;
+    			System.out.println("Day="+index);
+    			System.out.println("The top coordinate is"+DonutSpace.get(i).top);
+    			System.out.println("The bottom coordinate is "+DonutSpace.get(i).bottom);
+    			System.out.println("The Left coordinate is "+DonutSpace.get(i).left);
+    			System.out.println("The right coordinate is "+DonutSpace.get(i).right);
+    			
+    			
+    		 }
+    	 }
+    	  
+    	  invalidate();  
+    	
+    	}
+    	
+    	
+    	
     	Intent dataPage = new Intent(SleepProbeApplication2.getAppContext(), DayDataActivity.class);
     	dataPage.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     	dataPage.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+    	if(index!=-1){
     	SleepProbeApplication2.getAppContext().startActivity(dataPage);
+    	}
     	return true;
     }
     
+    public int getDay(MotionEvent event){
+    	
+    	int index=-1;
+    		
+    	
+    	
+    	if (event.getAction() == MotionEvent.ACTION_DOWN)  {
+    		
+    		float x=event.getX();
+        	float y=event.getY();
+        	System.out.println("X= "+x+","+"Y= "+y);
+        	
+    	  for(int i=0; i<DonutSpace.size();i++){
+    		
+    		if(DonutSpace.get(i).contains(x,y)){
+    			
+    			System.out.println("i="+i);
+    			return i;
+    			
+    		 }
+    	 }
+    	  
+    	  invalidate();  
+    	
+    	}
+    	
+    	return index;
+    	
+    }
+    
    
     //negative
     private float getDistanceFromZero(float f) {