diff --git a/android/app/src/main/java/com/chatman/HomeFragment.java b/android/app/src/main/java/com/chatman/HomeFragment.java
index 98d8896d848a69079ea3babb34b4672f8ee8566a..ec4c9376ab9088ab03662e5b74e266c6c4e48a59 100644
--- a/android/app/src/main/java/com/chatman/HomeFragment.java
+++ b/android/app/src/main/java/com/chatman/HomeFragment.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,6 +13,7 @@ import android.view.ViewGroup;
 import com.chatman.adapter.ChatListAdapter;
 import com.chatman.model.ChatList;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -49,7 +51,17 @@ public class HomeFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_home, container, false);
+        View view = inflater.inflate(R.layout.fragment_home, container, false);
+        // Recycler View
+        recycler = view.findViewById(R.id.chat_list_rv);
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getContext());
+        linearLayoutManager.setReverseLayout(true);
+        linearLayoutManager.setStackFromEnd(true);
+        recycler.setLayoutManager(linearLayoutManager);
+        getChatLists();
+        adapter = new ChatListAdapter(chatLists);
+        recycler.setAdapter(adapter);
+        return view;
     }
 
     // TODO: Rename method, update argument and hook method into UI event
@@ -91,69 +103,69 @@ public class HomeFragment extends Fragment {
         void onFragmentInteraction(Uri uri);
     }
 
-    //    // Todo: Ganti data dummmy jadi data asli ngambil dari database
-//    private List<ChatList> getChatLists() {
-//        chatLists = new ArrayList<>();
-//        chatLists.add(new ChatList(
-//                R.drawable.priagung,
-//                "Priagung Satyagama",
-//                "Woi sini ke sekre 2 temani diriku yang kesepian"
-//        ));
-//        chatLists.add(new ChatList(
-//                R.drawable.rama,
-//                "Yusuf Rahmat Pratama",
-//                "Eh, gmn gmn?"
-//        ));
-//        chatLists.add(new ChatList(
-//                R.drawable.priagung,
-//                "Priagung Satyagama",
-//                "Woi sini ke sekre 2 temani diriku yang kesepian"
-//        ));
-//        chatLists.add(new ChatList(
-//                R.drawable.rama,
-//                "Yusuf Rahmat Pratama",
-//                "Eh, gmn gmn?"
-//        ));
-//        chatLists.add(new ChatList(
-//                R.drawable.priagung,
-//                "Priagung Satyagama",
-//                "Woi sini ke sekre 2 temani diriku yang kesepian"
-//        ));
-//        chatLists.add(new ChatList(
-//                R.drawable.rama,
-//                "Yusuf Rahmat Pratama",
-//                "Eh, gmn gmn?"
-//        ));
-//        chatLists.add(new ChatList(
-//                R.drawable.priagung,
-//                "Priagung Satyagama",
-//                "Woi sini ke sekre 2 temani diriku yang kesepian"
-//        ));
-//        chatLists.add(new ChatList(
-//                R.drawable.rama,
-//                "Yusuf Rahmat Pratama",
-//                "Eh, gmn gmn?"
-//        ));
-//        chatLists.add(new ChatList(
-//                R.drawable.priagung,
-//                "Priagung Satyagama",
-//                "Woi sini ke sekre 2 temani diriku yang kesepian"
-//        ));
-//        chatLists.add(new ChatList(
-//                R.drawable.rama,
-//                "Yusuf Rahmat Pratama",
-//                "Eh, gmn gmn?"
-//        ));
-//        chatLists.add(new ChatList(
-//                R.drawable.priagung,
-//                "Priagung Satyagama",
-//                "Woi sini ke sekre 2 temani diriku yang kesepian"
-//        ));
-//        chatLists.add(new ChatList(
-//                R.drawable.rama,
-//                "Yusuf Rahmat Pratama",
-//                "Eh, gmn gmn?"
-//        ));
-//        return chatLists;
-//    }
+    // Todo: Ganti data dummmy jadi data asli ngambil dari database
+    private List<ChatList> getChatLists() {
+        chatLists = new ArrayList<>();
+        chatLists.add(new ChatList(
+                R.drawable.priagung,
+                "Priagung Satyagama",
+                "Woi sini ke sekre 2 temani diriku yang kesepian"
+        ));
+        chatLists.add(new ChatList(
+                R.drawable.rama,
+                "Yusuf Rahmat Pratama",
+                "Eh, gmn gmn?"
+        ));
+        chatLists.add(new ChatList(
+                R.drawable.priagung,
+                "Priagung Satyagama",
+                "Woi sini ke sekre 2 temani diriku yang kesepian"
+        ));
+        chatLists.add(new ChatList(
+                R.drawable.rama,
+                "Yusuf Rahmat Pratama",
+                "Eh, gmn gmn?"
+        ));
+        chatLists.add(new ChatList(
+                R.drawable.priagung,
+                "Priagung Satyagama",
+                "Woi sini ke sekre 2 temani diriku yang kesepian"
+        ));
+        chatLists.add(new ChatList(
+                R.drawable.rama,
+                "Yusuf Rahmat Pratama",
+                "Eh, gmn gmn?"
+        ));
+        chatLists.add(new ChatList(
+                R.drawable.priagung,
+                "Priagung Satyagama",
+                "Woi sini ke sekre 2 temani diriku yang kesepian"
+        ));
+        chatLists.add(new ChatList(
+                R.drawable.rama,
+                "Yusuf Rahmat Pratama",
+                "Eh, gmn gmn?"
+        ));
+        chatLists.add(new ChatList(
+                R.drawable.priagung,
+                "Priagung Satyagama",
+                "Woi sini ke sekre 2 temani diriku yang kesepian"
+        ));
+        chatLists.add(new ChatList(
+                R.drawable.rama,
+                "Yusuf Rahmat Pratama",
+                "Eh, gmn gmn?"
+        ));
+        chatLists.add(new ChatList(
+                R.drawable.priagung,
+                "Priagung Satyagama",
+                "Woi sini ke sekre 2 temani diriku yang kesepian"
+        ));
+        chatLists.add(new ChatList(
+                R.drawable.rama,
+                "Yusuf Rahmat Pratama",
+                "Eh, gmn gmn?"
+        ));
+        return chatLists;
+    }
 }
diff --git a/android/app/src/main/java/com/chatman/MainActivity.java b/android/app/src/main/java/com/chatman/MainActivity.java
index 932e33750140846eb71a723f7fa5a64553a87170..32854082c39bb47dbd327dc34509ece8c912153a 100644
--- a/android/app/src/main/java/com/chatman/MainActivity.java
+++ b/android/app/src/main/java/com/chatman/MainActivity.java
@@ -71,17 +71,6 @@ public class MainActivity extends AppCompatActivity implements
         setSupportActionBar(toolbar);
         context = this;
 
-        // Recycler View
-//        recycler = findViewById(R.id.chat_list_rv);
-//        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
-//        linearLayoutManager.setReverseLayout(true);
-//        linearLayoutManager.setStackFromEnd(true);
-//        recycler.setLayoutManager(linearLayoutManager);
-//        getChatLists();
-//        adapter = new ChatListAdapter(chatLists);
-//        recycler.setAdapter(adapter);
-
-
         // Bottom Navigation Bar
         bottomNavbar = findViewById(R.id.navigation);
         bottomNavbar.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
diff --git a/android/app/src/main/res/layout/fragment_profile.xml b/android/app/src/main/res/layout/fragment_profile.xml
index 8de71fc9f397dca4f55d0b50653563ec7db40b35..33e6c4e799f1a3511cc692a66c09a96696b109d1 100644
--- a/android/app/src/main/res/layout/fragment_profile.xml
+++ b/android/app/src/main/res/layout/fragment_profile.xml
@@ -31,6 +31,8 @@
         android:background="@drawable/button_round"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="20dp"
+        android:layout_marginLeft="50dp"
+        android:layout_marginRight="50dp"
         android:text="Logout" />
 
 </LinearLayout>