diff --git a/app/src/main/java/com/example/tampopo_client/views/MainActivity.java b/app/src/main/java/com/example/tampopo_client/views/MainActivity.java
index a2225ee..a477013 100644
--- a/app/src/main/java/com/example/tampopo_client/views/MainActivity.java
+++ b/app/src/main/java/com/example/tampopo_client/views/MainActivity.java
@@ -396,6 +396,28 @@
 //                                userView = container;
 //                                messageList.addView(container);
 
+                                ConstraintSet set = new ConstraintSet();
+                                set.clone(layout);
+                                int marginTopInPx = (int) TypedValue.applyDimension(
+                                        TypedValue.COMPLEX_UNIT_DIP,
+                                        marginTopInDp[i],
+                                        getResources().getDisplayMetrics()
+                                );
+                                int marginStartInPx = (int) TypedValue.applyDimension(
+                                        TypedValue.COMPLEX_UNIT_DIP,
+                                        marginStartInDp[i],
+                                        getResources().getDisplayMetrics()
+                                );
+
+                                set.connect(container.getId(), ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP, marginTopInPx);
+                                set.connect(container.getId(), ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START, marginStartInPx);
+
+                                set.applyTo(layout);
+
+                                if (i < 6) {
+                                    i++;
+                                }
+
                                 // TODO: CHANGE
                                 activitiesLiveData.observeForever(container.getActivitiesObserver());
                             }
@@ -403,29 +425,6 @@
                     }
                 }).start();
             }
-
-            FriendIconView userView2 = userViews.get(friendId);
-            ConstraintSet set = new ConstraintSet();
-            set.clone(layout);
-            int marginTopInPx = (int) TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    marginTopInDp[i],
-                    getResources().getDisplayMetrics()
-            );
-            int marginStartInPx = (int) TypedValue.applyDimension(
-                    TypedValue.COMPLEX_UNIT_DIP,
-                    marginStartInDp[i],
-                    getResources().getDisplayMetrics()
-            );
-
-            set.connect(userView2.getId(), ConstraintSet.TOP, ConstraintSet.PARENT_ID, ConstraintSet.TOP, marginTopInPx);
-            set.connect(userView2.getId(), ConstraintSet.START, ConstraintSet.PARENT_ID, ConstraintSet.START, marginStartInPx);
-
-            set.applyTo(layout);
-
-            if (i < 6) {
-                i++;
-            }
         }
     }