diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0f954e..0b194b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Version 0.2.4 - 2020-MM-DD
+### New features
+- Improved design
+- Implement signing up (Still needs a matrix.org fix)
+- Forward messages
+- Content viewer
 ### Fixes
 - Chat textfield isn't scrollable on large text
+- Text disappears in textfield on resuming the app
 
 # Version 0.2.3 - 2020-01-08
 ### New features
diff --git a/lib/components/content_banner.dart b/lib/components/content_banner.dart
index 596736e..33b65e0 100644
--- a/lib/components/content_banner.dart
+++ b/lib/components/content_banner.dart
@@ -32,12 +32,14 @@ class ContentBanner extends StatelessWidget {
       method: ThumbnailMethod.scale,
     );
     return InkWell(
-      onTap: () => Navigator.of(context).push(
-        AppRoute.defaultRoute(
-          context,
-          ContentWebView(mxContent),
-        ),
-      ),
+      onTap: () => mxContent.mxc?.isNotEmpty ?? false
+          ? Navigator.of(context).push(
+              AppRoute.defaultRoute(
+                context,
+                ContentWebView(mxContent),
+              ),
+            )
+          : null,
       child: Container(
         height: 200,
         color: Theme.of(context).secondaryHeaderColor,
diff --git a/lib/views/chat_details.dart b/lib/views/chat_details.dart
index a8ef2af..b03d8ef 100644
--- a/lib/views/chat_details.dart
+++ b/lib/views/chat_details.dart
@@ -113,7 +113,7 @@ class _ChatDetailsState extends State<ChatDetails> {
                     Divider(height: 1),
                     widget.room.canSendEvent("m.room.avatar") && !kIsWeb
                         ? ListTile(
-                            title: Text("Set group avatar"),
+                            title: Text("Upload group avatar"),
                             leading: Icon(Icons.camera),
                             onTap: () => setAvatarAction(context),
                           )