diff --git a/briar-gtk/briar_gtk/controllers/private_chat.py b/briar-gtk/briar_gtk/controllers/private_chat.py
index 652ad02ce5c5eb10178dcbc939f13adad5e1bb5f..185a8b87b6b4548ee1868d7ce3515940e9f514fe 100644
--- a/briar-gtk/briar_gtk/controllers/private_chat.py
+++ b/briar-gtk/briar_gtk/controllers/private_chat.py
@@ -68,6 +68,7 @@ class PrivateChatController:
             contact_name_label = self._builder.get_object("contact_name")
             contact_name_label.set_text(user_alias)
             self._sidebar_controller.refresh_contacts()
+            # TODO: Update name in chat history
 
     def open_delete_all_messages_dialog(self):
         if self._current_contact_id == 0:
diff --git a/briar-gtk/briar_gtk/views/add_contact.py b/briar-gtk/briar_gtk/views/add_contact.py
index f4cce0176f2adcf5c521185d937ebe6bf3d0a0b7..76adb3a5f5e15d75af10de524768447f63e88251 100644
--- a/briar-gtk/briar_gtk/views/add_contact.py
+++ b/briar-gtk/briar_gtk/views/add_contact.py
@@ -14,6 +14,8 @@ from briar_gtk.define import APP, RESOURCES_DIR
 
 class AddContactView(Gtk.Overlay):
 
+    # TODO: Move more logic into AddContactController
+
     ADD_CONTACT_UI = "add_contact.ui"
     STACK_NAME = "add_contact_flow_stack"
     HEADERS_NAME = "add_contact_flow_headers"
diff --git a/briar-gtk/briar_gtk/views/login.py b/briar-gtk/briar_gtk/views/login.py
index 980bf9f90b02bade58e20cee616f74b630ee60e3..06e3dc71dcd2edf60725b9c11aebe39760154c42 100644
--- a/briar-gtk/briar_gtk/views/login.py
+++ b/briar-gtk/briar_gtk/views/login.py
@@ -13,6 +13,8 @@ from briar_gtk.define import APP, RESOURCES_DIR
 
 class LoginView(Gtk.Overlay):
 
+    # TODO: Move more logic into LoginController
+
     LOGIN_UI = "login.ui"
     STACK_NAME = "login_flow_stack"
     HEADERS_NAME = "login_flow_headers"
diff --git a/briar-gtk/briar_gtk/views/private_chat.py b/briar-gtk/briar_gtk/views/private_chat.py
index b1f25a921e44f27c78546f0779f6dc767ca08462..a3071ad3f61f8c1ca78b9f5039a8124a9dde421c 100644
--- a/briar-gtk/briar_gtk/views/private_chat.py
+++ b/briar-gtk/briar_gtk/views/private_chat.py
@@ -18,6 +18,8 @@ from briar_gtk.widgets.private_message import PrivateMessageWidget
 # pylint: disable=too-many-instance-attributes
 class PrivateChatView(Gtk.Overlay):
 
+    # TODO: Move more logic into PrivateChatController
+
     CONTAINER_UI = "private_chat.ui"
 
     def __init__(self, builder):
diff --git a/briar-gtk/briar_gtk/views/registration.py b/briar-gtk/briar_gtk/views/registration.py
index 63aa3004359c80ca902781739aa294ee7f20e48e..4ef9246011da9dfc7b55d07c2f82a2c3beba07c4 100644
--- a/briar-gtk/briar_gtk/views/registration.py
+++ b/briar-gtk/briar_gtk/views/registration.py
@@ -13,6 +13,8 @@ from briar_gtk.define import APP, RESOURCES_DIR
 
 class RegistrationView(Gtk.Overlay):
 
+    # TODO: Move more logic into RegistrationController
+
     REGISTRATION_UI = "registration.ui"
     STACK_NAME = "registration_flow_stack"
     HEADERS_NAME = "registration_flow_headers"
diff --git a/briar-gtk/briar_gtk/views/sidebar.py b/briar-gtk/briar_gtk/views/sidebar.py
index 678a87f6955d020697e978abf26ffa06ecc5cf16..a3146a0b14f6419621f2053336c60c3f8192726e 100644
--- a/briar-gtk/briar_gtk/views/sidebar.py
+++ b/briar-gtk/briar_gtk/views/sidebar.py
@@ -7,6 +7,8 @@ from briar_gtk.widgets.contact_row import ContactRowWidget
 
 class SidebarView:
 
+    # TODO: Move more logic into SidebarController
+
     def __init__(self, builder):
         self._builder = builder