diff --git a/Yeeemp/app/src/main/java/art/pegasko/yeeemp/ui/activity/EventEditActivity.java b/Yeeemp/app/src/main/java/art/pegasko/yeeemp/ui/activity/EventEditActivity.java
index 264982a..de76f55 100644
--- a/Yeeemp/app/src/main/java/art/pegasko/yeeemp/ui/activity/EventEditActivity.java
+++ b/Yeeemp/app/src/main/java/art/pegasko/yeeemp/ui/activity/EventEditActivity.java
@@ -137,7 +137,6 @@ public class EventEditActivity extends AppCompatActivity {
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setDisplayShowHomeEnabled(true);
 
-
         if (this.eventContainer.timestamp != 0)
             binding.eventEditContent.eventEditTimestamp.setText(Utils.formatTs(this.eventContainer.timestamp));
         if (this.eventContainer.comment != null)
@@ -250,7 +249,7 @@ public class EventEditActivity extends AppCompatActivity {
             String[] tags = EventEditActivity.this.binding.eventEditContent.eventEditTags.getText().toString().split(",");
             tags = Utils.orderedDeduplicateIgnoreCaseAndTrim(tags);
 
-            EventEditActivity.this.binding.eventEditContent.eventEditTags.setText(String.join(", ", tags));
+            EventEditActivity.this.binding.eventEditContent.eventEditTags.setText(String.join(", ", tags) + ", ");
             EventEditActivity.this.binding.eventEditContent.eventEditTags.setSelection(EventEditActivity.this.binding.eventEditContent.eventEditTags.getText().length());
         });
 
diff --git a/Yeeemp/app/src/main/java/art/pegasko/yeeemp/ui/activity/EventListActivity.java b/Yeeemp/app/src/main/java/art/pegasko/yeeemp/ui/activity/EventListActivity.java
index 759ff5b..920f8f1 100644
--- a/Yeeemp/app/src/main/java/art/pegasko/yeeemp/ui/activity/EventListActivity.java
+++ b/Yeeemp/app/src/main/java/art/pegasko/yeeemp/ui/activity/EventListActivity.java
@@ -116,8 +116,9 @@ public class EventListActivity extends AppCompatActivity {
 
         /* FAB Listeners */
         binding.fab.setOnLongClickListener((View view) -> {
-            Snackbar.make(view, "Create Event", Snackbar.LENGTH_LONG).setAnchorView(R.id.fab).setAction("Action",
-                                                                                                        null
+            Snackbar.make(view, "Create Event", Snackbar.LENGTH_LONG).setAnchorView(R.id.fab).setAction(
+                "Action",
+                null
             ).show();
 
             return true;
diff --git a/Yeeemp/app/src/main/res/layout/activity_event_edit.xml b/Yeeemp/app/src/main/res/layout/activity_event_edit.xml
index 51d1cb4..77fecee 100644
--- a/Yeeemp/app/src/main/res/layout/activity_event_edit.xml
+++ b/Yeeemp/app/src/main/res/layout/activity_event_edit.xml
@@ -17,12 +17,12 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:titleTextColor="@color/pegasko_white"
-            android:background="@color/pegasko_dark" />
+            android:background="@color/pegasko_dark"
+            app:titleTextColor="@color/pegasko_white" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <include android:id="@+id/event_edit_content" layout="@layout/content_event_edit"/>
+    <include android:id="@+id/event_edit_content" layout="@layout/content_event_edit" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
diff --git a/Yeeemp/app/src/main/res/layout/activity_event_list.xml b/Yeeemp/app/src/main/res/layout/activity_event_list.xml
index 4ae3b42..635f6da 100644
--- a/Yeeemp/app/src/main/res/layout/activity_event_list.xml
+++ b/Yeeemp/app/src/main/res/layout/activity_event_list.xml
@@ -17,12 +17,12 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:titleTextColor="@color/pegasko_white"
-            android:background="@color/pegasko_dark" />
+            android:background="@color/pegasko_dark"
+            app:titleTextColor="@color/pegasko_white" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <include layout="@layout/content_event_list"/>
+    <include android:id="@+id/event_list_content" layout="@layout/content_event_list"/>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
diff --git a/Yeeemp/app/src/main/res/layout/content_event_edit.xml b/Yeeemp/app/src/main/res/layout/content_event_edit.xml
index 3c60482..35da4d4 100644
--- a/Yeeemp/app/src/main/res/layout/content_event_edit.xml
+++ b/Yeeemp/app/src/main/res/layout/content_event_edit.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:background="@color/pegasko_black"
-    android:orientation="vertical">
+    app:layout_behavior="@string/appbar_scrolling_view_behavior" >
 
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:app="http://schemas.android.com/apk/res-auto"
-            xmlns:tools="http://schemas.android.com/tools"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:background="@color/pegasko_black"
             android:orientation="vertical">
 
@@ -125,4 +124,4 @@
 
     </ScrollView>
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file