diff --git a/discordo.go b/discordo.go
index 27b1d81..4eb93bf 100644
--- a/discordo.go
+++ b/discordo.go
@@ -75,10 +75,6 @@ func main() {
 	}
 }
 
-func onLoginFormQuitButtonSelected() {
-	app.Stop()
-}
-
 func onMessagesTextViewChanged() {
 	app.Draw()
 }
@@ -86,11 +82,11 @@ func onMessagesTextViewChanged() {
 func onLoginModalDone(buttonIndex int, buttonLabel string) {
 	if buttonLabel == ui.LoginViaEmailPasswordLoginModalButton {
 		loginVia = "emailpassword"
-		loginForm = ui.NewLoginForm(loginVia, onLoginFormLoginButtonSelected, onLoginFormQuitButtonSelected)
+		loginForm = ui.NewLoginForm(loginVia, onLoginFormLoginButtonSelected)
 		app.SetRoot(loginForm, true)
 	} else if buttonLabel == ui.LoginViaTokenLoginModalButton {
 		loginVia = "token"
-		loginForm = ui.NewLoginForm(loginVia, onLoginFormLoginButtonSelected, onLoginFormQuitButtonSelected)
+		loginForm = ui.NewLoginForm(loginVia, onLoginFormLoginButtonSelected)
 		app.SetRoot(loginForm, true)
 	}
 }
diff --git a/ui/dropdowns.go b/ui/dropdowns.go
index 3a9a0ac..0e07623 100644
--- a/ui/dropdowns.go
+++ b/ui/dropdowns.go
@@ -7,10 +7,11 @@ import (
 )
 
 func NewGuildsDropDown(onGuildsDropDownSelected func(text string, index int), theme *util.Theme) (guildsDropDown *tview.DropDown) {
-	guildsDropDown = tview.NewDropDown().
-		SetLabel("Guild: ").
-		SetSelectedFunc(onGuildsDropDownSelected)
+	guildsDropDown = tview.NewDropDown()
+
 	guildsDropDown.
+		SetLabel("Guild: ").
+		SetSelectedFunc(onGuildsDropDownSelected).
 		SetLabelColor(tcell.GetColor(theme.DropDownForeground)).
 		SetFieldBackgroundColor(tcell.GetColor(theme.DropDownBackground)).
 		SetFieldTextColor(tcell.GetColor(theme.DropDownForeground)).
diff --git a/ui/forms.go b/ui/forms.go
index 31526a5..1747266 100644
--- a/ui/forms.go
+++ b/ui/forms.go
@@ -5,12 +5,12 @@ import (
 	"github.com/rivo/tview"
 )
 
-func NewLoginForm(via string, onLoginFormLoginButtonSelected func(), onLoginFormQuitButtonSelected func()) (loginForm *tview.Form) {
-	loginForm = tview.NewForm().
-		AddButton("Login", onLoginFormLoginButtonSelected).
-		AddButton("Quit", onLoginFormQuitButtonSelected).
-		SetButtonsAlign(tview.AlignCenter)
+func NewLoginForm(via string, onLoginFormLoginButtonSelected func()) (loginForm *tview.Form) {
+	loginForm = tview.NewForm()
+
 	loginForm.
+		AddButton("Login", onLoginFormLoginButtonSelected).
+		SetButtonsAlign(tview.AlignCenter).
 		SetButtonBackgroundColor(tcell.GetColor("#5865F2")).
 		SetBorder(true).
 		SetBorderPadding(0, 0, 1, 1)
diff --git a/ui/inputfields.go b/ui/inputfields.go
index 22f7f40..52e9e6c 100644
--- a/ui/inputfields.go
+++ b/ui/inputfields.go
@@ -7,11 +7,12 @@ import (
 )
 
 func NewMessageInputField(onMessageInputFieldDone func(key tcell.Key), theme *util.Theme) (messageInputField *tview.InputField) {
-	messageInputField = tview.NewInputField().
+	messageInputField = tview.NewInputField()
+
+	messageInputField.
 		SetPlaceholder("Message...").
 		SetFieldWidth(0).
-		SetDoneFunc(onMessageInputFieldDone)
-	messageInputField.
+		SetDoneFunc(onMessageInputFieldDone).
 		SetFieldBackgroundColor(tcell.GetColor(theme.InputFieldBackground)).
 		SetPlaceholderTextColor(tcell.GetColor(theme.InputFieldPlaceholderForeground)).
 		SetBackgroundColor(tcell.GetColor(theme.InputFieldBackground)).
diff --git a/ui/modals.go b/ui/modals.go
index 031418f..b77764f 100644
--- a/ui/modals.go
+++ b/ui/modals.go
@@ -4,15 +4,18 @@ import (
 	"github.com/rivo/tview"
 )
 
-const LoginViaTokenLoginModalButton = "Login via token"
-const LoginViaEmailPasswordLoginModalButton = "Login via email and password"
+const (
+	LoginViaTokenLoginModalButton         = "Login via token"
+	LoginViaEmailPasswordLoginModalButton = "Login via email and password"
+)
 
 func NewLoginModal(onLoginModalDone func(buttonIndex int, buttonLabel string)) (loginModal *tview.Modal) {
-	loginModal = tview.NewModal().
+	loginModal = tview.NewModal()
+
+	loginModal.
 		SetText("Choose a login method:").
 		AddButtons([]string{LoginViaTokenLoginModalButton, LoginViaEmailPasswordLoginModalButton}).
-		SetDoneFunc(onLoginModalDone)
-	loginModal.
+		SetDoneFunc(onLoginModalDone).
 		SetBorder(true).
 		SetBorderPadding(0, 0, 1, 1)
 
diff --git a/ui/textviews.go b/ui/textviews.go
index 6531804..5a470bc 100644
--- a/ui/textviews.go
+++ b/ui/textviews.go
@@ -7,12 +7,13 @@ import (
 )
 
 func NewMessagesTextView(onMessagesTextViewChanged func(), theme *util.Theme) (messagesTextView *tview.TextView) {
-	messagesTextView = tview.NewTextView().
+	messagesTextView = tview.NewTextView()
+
+	messagesTextView.
 		SetDynamicColors(true).
 		SetWordWrap(true).
 		ScrollToEnd().
-		SetChangedFunc(onMessagesTextViewChanged)
-	messagesTextView.
+		SetChangedFunc(onMessagesTextViewChanged).
 		SetTextColor(tcell.GetColor(theme.TextViewForeground)).
 		SetBackgroundColor(tcell.GetColor(theme.TextViewBackground)).
 		SetBorder(true).
diff --git a/ui/treeviews.go b/ui/treeviews.go
index 22ab378..857ea35 100644
--- a/ui/treeviews.go
+++ b/ui/treeviews.go
@@ -7,12 +7,13 @@ import (
 )
 
 func NewChannelsTreeView(channelsTreeNode *tview.TreeNode, onChannelsTreeViewSelected func(node *tview.TreeNode), theme *util.Theme) (channelsTreeView *tview.TreeView) {
-	channelsTreeView = tview.NewTreeView().
+	channelsTreeView = tview.NewTreeView()
+
+	channelsTreeView.
 		SetTopLevel(1).
 		SetRoot(channelsTreeNode).
 		SetCurrentNode(channelsTreeNode).
-		SetSelectedFunc(onChannelsTreeViewSelected)
-	channelsTreeView.
+		SetSelectedFunc(onChannelsTreeViewSelected).
 		SetBackgroundColor(tcell.GetColor(theme.TreeViewBackground)).
 		SetBorder(true).
 		SetBorderPadding(0, 0, 1, 1)