diff --git a/lib/main.dart b/lib/main.dart
index a394fc40..e7aeec98 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:frosty/providers/authentication_provider.dart';
-import 'package:frosty/widgets/channel_list.dart';
+import 'package:frosty/screens/channel_list.dart';
 import 'package:provider/provider.dart';
 
 void main() {
diff --git a/lib/widgets/channel_list.dart b/lib/screens/channel_list.dart
similarity index 100%
rename from lib/widgets/channel_list.dart
rename to lib/screens/channel_list.dart
diff --git a/lib/views/chat_view.dart b/lib/screens/chat.dart
similarity index 100%
rename from lib/views/chat_view.dart
rename to lib/screens/chat.dart
diff --git a/lib/widgets/channel_card.dart b/lib/widgets/channel_card.dart
index 9a54f65b..4c7f8bcc 100644
--- a/lib/widgets/channel_card.dart
+++ b/lib/widgets/channel_card.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:frosty/models/channel.dart';
-import 'package:frosty/views/chat_view.dart';
+import 'package:frosty/screens/chat.dart';
 
 /// A card widget that displays a live channel's thumbnail and details.
 class ChannelCard extends StatelessWidget {
diff --git a/lib/widgets/chat_message.dart b/lib/widgets/chat_message.dart
index 47462abb..d8c72447 100644
--- a/lib/widgets/chat_message.dart
+++ b/lib/widgets/chat_message.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/widgets.dart';
 
 class ChatMessage extends StatelessWidget {
-  List<InlineSpan> children;
+  final List<InlineSpan> children;
 
   ChatMessage({Key? key, required this.children}) : super(key: key);