Index: client/Client/Button.h
===================================================================
--- client/Client/Button.h	(revision 09ddba7dbba8667a4de6e3bd284419ddef3ea498)
+++ client/Client/Button.h	(revision 365e15609788cc71f66f3b238528e66756bedad4)
Index: client/Client/Client.vcxproj
===================================================================
--- client/Client/Client.vcxproj	(revision 09ddba7dbba8667a4de6e3bd284419ddef3ea498)
+++ client/Client/Client.vcxproj	(revision 365e15609788cc71f66f3b238528e66756bedad4)
@@ -79,4 +79,5 @@
     <ClCompile Include="RadioButtonList.cpp" />
     <ClCompile Include="Textbox.cpp" />
+    <ClCompile Include="TextLabel.cpp" />
     <ClCompile Include="Window.cpp" />
   </ItemGroup>
@@ -94,4 +95,5 @@
     <ClInclude Include="RadioButtonList.h" />
     <ClInclude Include="Textbox.h" />
+    <ClInclude Include="TextLabel.h" />
     <ClInclude Include="Window.h" />
   </ItemGroup>
Index: client/Client/Client.vcxproj.filters
===================================================================
--- client/Client/Client.vcxproj.filters	(revision 09ddba7dbba8667a4de6e3bd284419ddef3ea498)
+++ client/Client/Client.vcxproj.filters	(revision 365e15609788cc71f66f3b238528e66756bedad4)
@@ -67,4 +67,7 @@
       <Filter>Source Files\common</Filter>
     </ClCompile>
+    <ClCompile Include="TextLabel.cpp">
+      <Filter>Source Files\gui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -108,4 +111,7 @@
       <Filter>Header Files\common</Filter>
     </ClInclude>
+    <ClInclude Include="TextLabel.h">
+      <Filter>Header Files\gui</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
Index: client/Client/TextLabel.cpp
===================================================================
--- client/Client/TextLabel.cpp	(revision 365e15609788cc71f66f3b238528e66756bedad4)
+++ client/Client/TextLabel.cpp	(revision 365e15609788cc71f66f3b238528e66756bedad4)
@@ -0,0 +1,52 @@
+#include "TextLabel.h"
+
+#include <iostream>
+
+TextLabel::TextLabel(int x, int y, int width, int height, ALLEGRO_FONT *font, string str, int alignment) :
+   GuiComponent(x, y, width, height, font)
+{
+   this->str = str;
+   this->alignment = alignment;
+}
+
+TextLabel::~TextLabel(void)
+{
+}
+
+void TextLabel::draw(ALLEGRO_DISPLAY *display)
+{
+   al_set_target_bitmap(bitmap);
+   al_clear_to_color(al_map_rgb(0, 0, 0));
+
+   int fontHeight = al_get_font_line_height(font);
+   int targetX;
+
+   switch(this->alignment) {
+      case ALLEGRO_ALIGN_LEFT:
+         targetX = 0;
+         break;
+      case ALLEGRO_ALIGN_RIGHT:
+         targetX = this->width;
+         break;
+      case ALLEGRO_ALIGN_CENTRE:
+         targetX = this->width/2;
+         break;
+      default:
+         cout << "Invalid alignment: " << this->alignment << endl;
+         break;
+   }
+
+   al_draw_text(font, al_map_rgb(0, 255, 0), targetX, (this->height-fontHeight)/2, this->alignment, this->str.c_str());
+
+   al_set_target_bitmap(al_get_backbuffer(display));
+   al_draw_bitmap(bitmap, x, y, 0);
+}
+
+bool TextLabel::handleEvent(ALLEGRO_EVENT& e)
+{
+   return false;
+}
+
+void TextLabel::setText(string str) {
+   this->str = str;
+}
Index: client/Client/TextLabel.h
===================================================================
--- client/Client/TextLabel.h	(revision 365e15609788cc71f66f3b238528e66756bedad4)
+++ client/Client/TextLabel.h	(revision 365e15609788cc71f66f3b238528e66756bedad4)
@@ -0,0 +1,27 @@
+#ifndef _TEXTLABEL_H
+#define _TEXTLABEL_H
+
+#include "GuiComponent.h"
+
+#include <string>
+
+using namespace std;
+
+class TextLabel :
+   public GuiComponent
+{
+private:
+   string str;
+   int alignment;
+
+public:
+   TextLabel(int x, int y, int width, int height, ALLEGRO_FONT *font, string str, int alignment);
+   ~TextLabel(void);
+
+   void draw(ALLEGRO_DISPLAY *display);
+   bool handleEvent(ALLEGRO_EVENT& e);
+
+   void setText(string str);
+};
+
+#endif
Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision 09ddba7dbba8667a4de6e3bd284419ddef3ea498)
+++ client/Client/main.cpp	(revision 365e15609788cc71f66f3b238528e66756bedad4)
@@ -38,4 +38,5 @@
 #include "Button.h"
 #include "RadioButtonList.h"
+#include "TextLabel.h"
 #include "chat.h"
 
@@ -87,4 +88,5 @@
 Textbox* txtUsername;
 Textbox* txtPassword;
+TextLabel* lblLoginStatus;
 
 // wndRegister
@@ -92,4 +94,5 @@
 Textbox* txtPasswordRegister;
 RadioButtonList* rblClasses;
+TextLabel* lblRegisterStatus;
 
 // wndMain
@@ -180,28 +183,43 @@
    WorldMap* gameMap = WorldMap::loadMapFromFile("../../data/map.txt");
 
+   cout << "Loaded map" << endl;
+
    wndLogin = new Window(0, 0, SCREEN_W, SCREEN_H);
    wndLogin->addComponent(new Textbox(516, 40, 100, 20, font));
    wndLogin->addComponent(new Textbox(516, 70, 100, 20, font));
-   wndLogin->addComponent(new Button(330, 100, 194, 20, font, "Create an Account", goToRegisterScreen));
-   wndLogin->addComponent(new Button(534, 100, 60, 20, font, "Login", login));
+   wndLogin->addComponent(new TextLabel(410, 40, 100, 20, font, "Username:", ALLEGRO_ALIGN_RIGHT));
+   wndLogin->addComponent(new TextLabel(410, 70, 100, 20, font, "Password:", ALLEGRO_ALIGN_RIGHT));
+   wndLogin->addComponent(new TextLabel((SCREEN_W-600)/2, 100, 600, 20, font, "", ALLEGRO_ALIGN_CENTRE));
+   wndLogin->addComponent(new Button(SCREEN_W/2-100, 130, 90, 20, font, "Register", goToRegisterScreen));
+   wndLogin->addComponent(new Button(SCREEN_W/2+10, 130, 90, 20, font, "Login", login));
    wndLogin->addComponent(new Button(920, 10, 80, 20, font, "Quit", quit));
 
    txtUsername = (Textbox*)wndLogin->getComponent(0);
    txtPassword = (Textbox*)wndLogin->getComponent(1);
+   lblLoginStatus = (TextLabel*)wndLogin->getComponent(4);
+
+   cout << "Created login screen" << endl;
 
    wndRegister = new Window(0, 0, SCREEN_W, SCREEN_H);
    wndRegister->addComponent(new Textbox(516, 40, 100, 20, font));
    wndRegister->addComponent(new Textbox(516, 70, 100, 20, font));
-   wndRegister->addComponent(new Button(468, 100, 56, 20, font, "Back", goToLoginScreen));
-   wndRegister->addComponent(new Button(534, 100, 70, 20, font, "Submit", registerAccount));
+   wndRegister->addComponent(new TextLabel(410, 40, 100, 20, font, "Username:", ALLEGRO_ALIGN_RIGHT));
+   wndRegister->addComponent(new TextLabel(410, 70, 100, 20, font, "Password:", ALLEGRO_ALIGN_RIGHT));
+   wndRegister->addComponent(new RadioButtonList(432, 100, "Pick a class", font));
+   wndRegister->addComponent(new TextLabel((SCREEN_W-600)/2, 190, 600, 20, font, "", ALLEGRO_ALIGN_CENTRE));
+   wndRegister->addComponent(new Button(SCREEN_W/2-100, 220, 90, 20, font, "Back", goToLoginScreen));
+   wndRegister->addComponent(new Button(SCREEN_W/2+10, 220, 90, 20, font, "Submit", registerAccount));
    wndRegister->addComponent(new Button(920, 10, 80, 20, font, "Quit", quit));
-   wndRegister->addComponent(new RadioButtonList(432, 130, "Pick a class", font));
 
    txtUsernameRegister = (Textbox*)wndRegister->getComponent(0);
    txtPasswordRegister = (Textbox*)wndRegister->getComponent(1);
 
-   rblClasses = (RadioButtonList*)wndRegister->getComponent(5);
+   rblClasses = (RadioButtonList*)wndRegister->getComponent(4);
    rblClasses->addRadioButton("Warrior");
    rblClasses->addRadioButton("Ranger");
+
+   lblRegisterStatus = (TextLabel*)wndRegister->getComponent(5);
+
+   cout << "Created register screen" << endl;
 
    wndMain = new Window(0, 0, SCREEN_W, SCREEN_H);
@@ -211,4 +229,6 @@
 
    txtChat = (Textbox*)wndMain->getComponent(0);
+
+   cout << "Created main screen" << endl;
 
    wndCurrent = wndLogin;
@@ -380,6 +400,6 @@
          // There should be label gui components that show these or each textbox should have a label
          if(wndCurrent == wndLogin || wndCurrent == wndRegister) {
-            al_draw_text(font, al_map_rgb(0, 255, 0), 416, 43, ALLEGRO_ALIGN_LEFT, "Username:");
-            al_draw_text(font, al_map_rgb(0, 255, 0), 413, 73, ALLEGRO_ALIGN_LEFT, "Password:");
+            //al_draw_text(font, al_map_rgb(0, 255, 0), 416, 43, ALLEGRO_ALIGN_LEFT, "Username:");
+            //al_draw_text(font, al_map_rgb(0, 255, 0), 413, 73, ALLEGRO_ALIGN_LEFT, "Password:");
          }
          else if(wndCurrent == wndMain) {
@@ -541,4 +561,5 @@
             case MSG_TYPE_REGISTER:
             {
+               lblRegisterStatus->setText(response);
                break;
             }
@@ -549,4 +570,5 @@
                   username.clear();
                   cout << "User login failed" << endl;
+                  lblLoginStatus->setText(response);
                }
                else if (response.compare("Incorrect username or password") == 0)
@@ -554,4 +576,5 @@
                   username.clear();
                   cout << "User login failed" << endl;
+                  lblLoginStatus->setText(response);
                }
                else
@@ -573,5 +596,5 @@
                break;
             }
-            case MSG_TYPE_PLAYER:   // kind of hacky to put this here
+            case MSG_TYPE_PLAYER:
             {
                Player p("", "");
@@ -592,4 +615,9 @@
                break;
             }
+            default:
+            {
+               cout << "(STATE_REGISTER) Received invlaid message of type " << msg.type << endl;
+               break;
+            }
          }
 
@@ -600,8 +628,4 @@
          switch(msg.type)
          {
-            case MSG_TYPE_REGISTER:
-            {
-               break;
-            }
             case MSG_TYPE_LOGIN:
             {
@@ -760,5 +784,6 @@
             default:
             {
-               cout << "Received an unexpected message type: " << msg.type << endl;
+               cout << "(STATE_LOGIN) Received invlaid message of type " << msg.type << endl;
+               break;
             }
          }