diff --git a/Habitica/res/layout/tavern_chat_item.xml b/Habitica/res/layout/tavern_chat_item.xml
index c35b821d2..ee85c7df9 100644
--- a/Habitica/res/layout/tavern_chat_item.xml
+++ b/Habitica/res/layout/tavern_chat_item.xml
@@ -32,56 +32,57 @@
             style="@style/CardContent.Compact"
             android:background="@drawable/layout_rounded_bg"
             android:padding="@dimen/spacing_medium">
-            <LinearLayout
-                android:layout_width="fill_parent"
+            <TableLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:weightSum="1.0"
                 android:baselineAligned="false"
-                android:gravity="center_vertical">
-                <com.habitrpg.android.habitica.ui.views.social.UsernameLabel
-                    android:id="@+id/user_label"
-                    style="@style/ChatMessageUserTextViewStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:clickable="true"
-                    tools:text="Username"
-                    android:focusable="true" />
-                <TextView
-                    android:id="@+id/mod_view"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:textSize="12sp"
-                    android:textColor="@color/white"
-                    style="@style/Pill.Purple"
-                    tools:text="Moderator"
-                    android:layout_marginLeft="@dimen/spacing_small"/>
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:layout_weight="1" />
-                <LinearLayout
-                    android:id="@+id/like_background_layout"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical|right"
-
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginStart="5dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/layout_rounded_bg">
-
-                    <TextView
-                        android:id="@+id/tvLikes"
+                android:gravity="center_vertical"
+                android:shrinkColumns="0"
+                android:stretchColumns="2">
+                <TableRow
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+                    <com.habitrpg.android.habitica.ui.views.social.UsernameLabel
+                        android:id="@+id/user_label"
+                        style="@style/ChatMessageUserTextViewStyle"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_margin="5dp"
+                        android:layout_gravity="center_vertical"
                         android:clickable="true"
-                        android:gravity="center_vertical"
+                        tools:text="Username"
                         android:focusable="true" />
-                </LinearLayout>
-            </LinearLayout>
-
+                    <TextView
+                        android:id="@+id/mod_view"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:textSize="12sp"
+                        android:textColor="@color/white"
+                        style="@style/Pill.Purple"
+                        tools:text="Moderator"
+                        android:layout_marginLeft="@dimen/spacing_small"/>
+                    <View
+                        android:layout_width="0dp"
+                        android:layout_height="1dp"/>
+                    <LinearLayout
+                        android:id="@+id/like_background_layout"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginStart="5dp"
+                        android:background="@drawable/layout_rounded_bg">
+                        <TextView
+                            android:id="@+id/tvLikes"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_margin="5dp"
+                            android:clickable="true"
+                            android:gravity="center_vertical"
+                            android:focusable="true" />
+                    </LinearLayout>
+                </TableRow>
+            </TableLayout>
             <TextView
                 android:id="@+id/subline_textview"
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 2168fba18..d65e4fe8f 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -807,7 +807,7 @@
     <string name="daily_tip_7">Try pinning items from the Market to your Rewards to help motivate you to earn them!</string>
     <string name="daily_tip_8">You can change your task\'s difficulty to reward yourself more for hard tasks!</string>
     <string name="daily_tip_9">If you\'re having a tough time, try breaking your tasks down into smaller parts.</string>
-    <string name="moderator">Moderator</string>
+    <string name="moderator">Mod</string>
     <string name="staff">Staff</string>
     <string name="expand_notes">Read More</string>
     <string name="collapse_notes">Show Less</string>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt
index 9188e73a2..d53bbb4c9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/UsernameLabel.kt
@@ -39,11 +39,12 @@ class UsernameLabel(context: Context?, attrs: AttributeSet?) : LinearLayout(cont
     }
 
     init {
-        val params = LayoutParams(
+        val textViewParams = LayoutParams(
                 FrameLayout.LayoutParams.WRAP_CONTENT,
                 FrameLayout.LayoutParams.WRAP_CONTENT)
-        params.gravity = Gravity.CENTER_VERTICAL
-        addView(textView, params)
+        textViewParams.gravity = Gravity.CENTER_VERTICAL
+        textViewParams.weight = 1.0f
+        addView(textView, textViewParams)
         val padding = context?.resources?.getDimension(R.dimen.spacing_small)?.toInt() ?: 0
         textView.setPadding(0, 0, padding, 0)
         textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14f)
@@ -52,6 +53,10 @@ class UsernameLabel(context: Context?, attrs: AttributeSet?) : LinearLayout(cont
         } else {
             textView.setTextAppearance(context, R.style.Body1)
         }
-        addView(tierIconView, params)
+        val iconViewParams = LayoutParams(
+                FrameLayout.LayoutParams.WRAP_CONTENT,
+                FrameLayout.LayoutParams.WRAP_CONTENT)
+        iconViewParams.gravity = Gravity.CENTER_VERTICAL
+        addView(tierIconView, iconViewParams)
     }
 }
\ No newline at end of file