diff --git a/.idea/modules.xml b/.idea/modules.xml
index 92af58643bfa89c0f27e1531c072e9833294e9f8..e7f8ce27d03a577d3d01e18a03a64c9c7d4d14c9 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,10 +2,11 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
+      <module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" />
       <module fileurl="file://F:\informatika\pbd\fitness\android.iml" filepath="F:\informatika\pbd\fitness\android.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/fitness.iml" filepath="$PROJECT_DIR$/fitness.iml" />
       <module fileurl="file://D:\tugas\sem6\pbd\tubes\android\fitness.iml" filepath="D:\tugas\sem6\pbd\tubes\android\fitness.iml" />
+      <module fileurl="file://D:\Semester 6\PBD\Tugas Besar\android\fitness.iml" filepath="D:\Semester 6\PBD\Tugas Besar\android\fitness.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f9de2d840a2a08aff6c979c91f7b12bd359fb4b3..2bd5d5a3b6c4720e20671a285b8eb3e7c6b6f436 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,6 +39,7 @@
         <activity android:name=".PlankActivity" />
         <activity android:name=".PushupActivity" />
         <activity android:name=".SitupActivity" />
+        <activity android:name=".ChatActivity" />
         <activity android:name=".LevelActivity" />
         <activity android:name=".ExerciseActivity" />
         <!--
diff --git a/app/src/main/java/com/example/leo/fitnessdiy/HomeActivity.java b/app/src/main/java/com/example/leo/fitnessdiy/HomeActivity.java
index 7c9d1fb657584d7ae0fad4bf3f36643eba07c719..2a28ad74291cbec812aac65ee7e4a50fc3eb3947 100644
--- a/app/src/main/java/com/example/leo/fitnessdiy/HomeActivity.java
+++ b/app/src/main/java/com/example/leo/fitnessdiy/HomeActivity.java
@@ -70,6 +70,7 @@ public class HomeActivity extends AppCompatActivity
         startActivity(i);
     }
     public void goToChat(View view) {
-
+        Intent i = new Intent(getApplicationContext(), ChatActivity.class);
+        startActivity(i);
     }
 }
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index cb97e984eb4945d7f0d54dff861b54cc68a97f04..04118a33d02e065f21bb08c91776517f4c54ecec 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -11,23 +11,35 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
+
         <Button
             android:id="@+id/history_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:onClick="openHistory"
-            android:text="@string/history"/>
+            android:text="@string/history" />
+
         <Button
             android:id="@+id/exercise_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/exercise"
-            android:onClick="changeFragment"/>
+            android:onClick="changeFragment"
+            android:text="@string/exercise" />
+
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Jogging"
-            android:onClick="openJogging"/>
+            android:onClick="openJogging"
+            android:text="Jogging" />
+
+        <android.support.design.widget.FloatingActionButton
+            android:id="@+id/chat_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:layout_weight="3"
+            android:onClick="goToChat" />
+
     </LinearLayout>
 
     <fragment
@@ -36,13 +48,5 @@
         android:layout_width="match_parent"
         android:layout_height="471dp" />
 
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/chat_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="right"
-        android:onClick="goToChat"/>
-
-
 
 </LinearLayout>
diff --git a/gradle.properties b/gradle.properties
index 587d5bd674e12e88a7a0bda235f1603b6fc681a1..7be7ec5c48b03f560108bfbb9005a6098f4a13d7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,11 +13,4 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Mon Feb 19 17:06:30 GMT+07:00 2018
-systemProp.http.proxyPassword=02414056
-systemProp.https.proxyUser=leo16515325
-systemProp.https.proxyPort=8080
-systemProp.http.proxyHost=cache.itb.ac.id
-systemProp.https.proxyPassword=02414056
-systemProp.https.proxyHost=cache.itb.ac.id
-systemProp.http.proxyPort=8080
-systemProp.http.proxyUser=leo16515325
+