diff --git a/src/gui/Contacts.cpp b/src/gui/Contacts.cpp
index 4973397..3276cb6 100644
--- a/src/gui/Contacts.cpp
+++ b/src/gui/Contacts.cpp
@@ -1,7 +1,5 @@
 #include "Contacts.h"
 #include <Application.h>
-#include <GroupLayout.h>
-#include <InterfaceDefs.h>
 #include <Rect.h>
 #include <Window.h>
 #include <StringView.h>
@@ -9,10 +7,5 @@
 Contacts::Contacts(void) 
 	: 	BWindow(BRect(200,200,600,400), TITLE, B_TITLED_WINDOW, B_NOT_MINIMIZABLE | B_QUIT_ON_WINDOW_CLOSE)
 {
-	BGroupLayout *group = new BGroupLayout(B_VERTICAL);
-	SetLayout(group);
-
-	group->View()->AdoptSystemColors();
-
-	group->AddView(new BStringView("label", "Placeholder label (contact list to be added)"));
+	AddChild(new BStringView("label", "Placeholder label (contact list to be added)"));
 }
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index a76aa0c..8ef0143 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -47,8 +47,8 @@ MainWindow::MainWindow(void)
 	BButton *connectButton = new BButton(Frame(), "connect", "Connect!", new BMessage(msgConnectButtonClicked));
 	connectButton->SetTarget(this);
 
-	BTextControl *jidInput = new BTextControl("jidinput", "JID:", "Placeholder", NULL);
-	BTextControl *pwInput = new BTextControl("pwinput", "Password:", "Placeholder", NULL);
+	BTextControl *jidInput = new BTextControl("jidinput", "JID:", "Placeholder", new BMessage(msgConnectButtonClicked));
+	BTextControl *pwInput = new BTextControl("pwinput", "Password:", "Placeholder", new BMessage(msgConnectButtonClicked));
 
 	pwInput->TextView()->HideTyping(true);