diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 50d38ac..7b9cfac 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,30 +2,29 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="eb36c2e9-c6c6-48da-b007-cd41eccd9e5a" name="Default" comment="">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/resources/images/logout.png" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/resources/images/scores.png" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTCircleCounter.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImageBtn.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Home$1.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Home$1.class" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Game.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTGameBox.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLetter.java" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Highscores$1.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Highscores$1.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Highscores.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Highscores.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Home.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Home.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/MatchRequests.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/MatchRequests.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/MatchSetup.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/MatchSetup.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Menu$5.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Menu$5.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Menu.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Menu.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Page.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Page.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Register$2.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Register$2.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Register.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Register.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/ui/TTButton.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/ui/TTButton.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/ui/TTImage.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/ui/TTImage.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/ui/TTLabelBtn.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/ui/TTLabelBtn.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/TextTwist/.idea/workspace.xml" afterPath="$PROJECT_DIR$/out/production/TextTwist/.idea/workspace.xml" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -36,7 +35,7 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="CoverageDataManager">
-    <SUITE FILE_PATH="coverage/TextTwist$Main__1_.coverage" NAME="Main (1) Coverage Results" MODIFIED="1497395192247" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+    <SUITE FILE_PATH="coverage/TextTwist$Main__1_.coverage" NAME="Main (1) Coverage Results" MODIFIED="1497438042403" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
       <FILTER>com.texttwist.client.*</FILTER>
     </SUITE>
   </component>
@@ -46,20 +45,8 @@
       <file leaf-file-name="Home.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="473">
-              <caret line="60" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Register.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="219">
-              <caret line="23" column="22" lean-forward="true" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
+            <state relative-caret-position="63">
+              <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -69,21 +56,9 @@
       </file>
       <file leaf-file-name="Page.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="95">
-              <caret line="41" column="48" lean-forward="true" selection-start-line="41" selection-start-column="48" selection-end-line="41" selection-end-column="48" />
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Menu.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="179">
-              <caret line="17" column="22" lean-forward="true" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
+              <caret line="45" column="0" lean-forward="true" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -91,11 +66,62 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Highscores.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Game.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Game.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="328">
+              <caret line="108" column="45" lean-forward="true" selection-start-line="108" selection-start-column="45" selection-end-line="108" selection-end-column="45" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#456#464#0" expanded="true" />
+                <element signature="e#533#541#0" expanded="true" />
+                <element signature="e#623#630#0" expanded="true" />
+                <element signature="e#2115#2116#0" expanded="true" />
+                <element signature="e#2142#2143#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TTLetter.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLetter.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="126">
+              <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TTInputBox.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputBox.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="137">
+              <caret line="8" column="33" lean-forward="true" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Palette.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="84">
+              <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Highscores.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="410">
-              <caret line="66" column="33" lean-forward="true" selection-start-line="66" selection-start-column="33" selection-end-line="66" selection-end-column="33" />
+            <state relative-caret-position="203">
+              <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="e#655#663#0" expanded="true" />
@@ -104,35 +130,13 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TTScrollList.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java">
+      <file leaf-file-name="TTLabel.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="63">
-              <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Palette.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="105">
-              <caret line="5" column="33" lean-forward="true" selection-start-line="5" selection-start-column="33" selection-end-line="5" selection-end-column="33" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="TTPasswordField.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="284">
-              <caret line="39" column="0" lean-forward="true" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
+            <state relative-caret-position="368">
+              <caret line="35" column="14" lean-forward="true" selection-start-line="35" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="e#832#1245#0" expanded="true" />
-                <element signature="e#1244#1245#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -141,11 +145,11 @@
       <file leaf-file-name="MatchRequests.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
-              <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+            <state relative-caret-position="242">
+              <caret line="47" column="34" lean-forward="true" selection-start-line="47" selection-start-column="34" selection-end-line="47" selection-end-column="34" />
               <folding>
-                <element signature="e#182#183#0" expanded="true" />
-                <element signature="e#211#212#0" expanded="true" />
+                <element signature="imports" expanded="true" />
+                <element signature="e#699#707#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -160,6 +164,15 @@
       </list>
     </option>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>Sys</find>
+      <find>Syst</find>
+      <find>System</find>
+      <find>System.</find>
+      <find>getRandomPo</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -193,19 +206,24 @@
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImageBtn.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTCircleCounter.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTGameBox.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLetter.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/LettersPlaceholders.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Game.java" />
       </list>
     </option>
   </component>
@@ -237,6 +255,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -441,9 +461,7 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="Scratches" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -455,13 +473,6 @@
     <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\Users\loke\TextTwist\Client\resources\images" />
-      <recent name="C:\Users\loke\TextTwist\Client\img" />
-    </key>
-    <key name="CopyClassDialog.RECENTS_KEY">
-      <recent name="" />
-    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\loke\TextTwist\Client\resources\images" />
       <recent name="C:\Users\loke\TextTwist\Client\resources" />
@@ -469,6 +480,13 @@
       <recent name="C:\Users\loke\TextTwist\Client\src\com\texttwist\client\ui" />
       <recent name="C:\Users\loke\TextTwist\Client" />
     </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="" />
+    </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\loke\TextTwist\Client\resources\images" />
+      <recent name="C:\Users\loke\TextTwist\Client\img" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -907,47 +925,48 @@
       <updated>1497277836157</updated>
       <workItem from="1497277840504" duration="21181000" />
       <workItem from="1497343606634" duration="28876000" />
-      <workItem from="1497387626373" duration="13263000" />
+      <workItem from="1497387626373" duration="13500000" />
+      <workItem from="1497426956018" duration="14628000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="63320000" />
+    <option name="totallyTimeSpent" value="78185000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-1709" y="-107" width="1718" height="928" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32869786" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19216181" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28235295" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39949432" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32869786" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19216181" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.28235295" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39949432" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -958,7 +977,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="4" />
+      <option name="time" value="7" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -967,56 +986,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1008">
-          <caret line="52" column="36" lean-forward="false" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="20" column="9" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="19" column="28" lean-forward="false" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="105">
@@ -1091,8 +1060,6 @@
           <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#832#1245#0" expanded="true" />
-            <element signature="e#1244#1245#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1177,26 +1144,6 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.form" />
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputField.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="84">
-          <caret line="4" column="21" lean-forward="true" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputBox.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#243#244#0" expanded="true" />
-            <element signature="e#274#275#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/awt/event/MouseAdapter.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-240">
@@ -1205,16 +1152,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="116">
-          <caret line="17" column="43" lean-forward="true" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="336">
@@ -1225,16 +1162,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="394">
-          <caret line="19" column="24" lean-forward="true" selection-start-line="19" selection-start-column="24" selection-end-line="19" selection-end-column="24" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="147">
@@ -1245,49 +1172,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImageBtn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="273">
-          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#561#945#0" expanded="true" />
-            <element signature="e#944#945#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="25" column="73" lean-forward="true" selection-start-line="25" selection-start-column="73" selection-end-line="25" selection-end-column="73" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="9" column="22" lean-forward="true" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
-          <folding>
-            <element signature="e#177#178#0" expanded="true" />
-            <element signature="e#206#207#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="347">
-          <caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="22" selection-end-column="25" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="263">
@@ -1308,41 +1192,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImageBtn.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="219">
-          <caret line="23" column="22" lean-forward="true" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
-          <folding>
-            <element signature="e#182#183#0" expanded="true" />
-            <element signature="e#211#212#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="179">
-          <caret line="17" column="22" lean-forward="true" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="95">
-          <caret line="41" column="48" lean-forward="true" selection-start-line="41" selection-start-column="48" selection-end-line="41" selection-end-column="48" />
+        <state relative-caret-position="399">
+          <caret line="29" column="11" lean-forward="true" selection-start-line="18" selection-start-column="8" selection-end-line="29" selection-end-column="11" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1351,46 +1204,202 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="284">
-          <caret line="39" column="0" lean-forward="true" selection-start-line="39" selection-start-column="0" selection-end-line="39" selection-end-column="0" />
+        <state relative-caret-position="410">
+          <caret line="32" column="36" lean-forward="true" selection-start-line="28" selection-start-column="4" selection-end-line="32" selection-end-column="36" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="399">
+          <caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputField.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="10" column="3" lean-forward="true" selection-start-line="10" selection-start-column="3" selection-end-line="10" selection-end-column="3" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="60" column="0" lean-forward="false" selection-start-line="59" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="203">
+          <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="82" column="53" lean-forward="true" selection-start-line="82" selection-start-column="53" selection-end-line="82" selection-end-column="53" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="73" column="21" lean-forward="true" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="21" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#542#543#0" expanded="true" />
+            <element signature="e#569#570#0" expanded="true" />
+            <element signature="e#768#776#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="200">
+          <caret line="22" column="43" lean-forward="true" selection-start-line="22" selection-start-column="43" selection-end-line="22" selection-end-column="43" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1256#1476#0" expanded="true" />
+            <element signature="e#1475#1476#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTGameBox.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="24" column="55" lean-forward="true" selection-start-line="24" selection-start-column="55" selection-end-line="24" selection-end-column="55" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1056#1276#0" expanded="true" />
+            <element signature="e#1275#1276#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="161">
+          <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="378">
+          <caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="22" selection-end-column="25" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="242">
+          <caret line="47" column="34" lean-forward="true" selection-start-line="47" selection-start-column="34" selection-end-line="47" selection-end-column="34" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#699#707#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputBox.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="137">
+          <caret line="8" column="33" lean-forward="true" selection-start-line="8" selection-start-column="33" selection-end-line="8" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="35" column="14" lean-forward="true" selection-start-line="35" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLetter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/LettersPlaceholders.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="14" column="1" lean-forward="true" selection-start-line="14" selection-start-column="1" selection-end-line="14" selection-end-column="1" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="179">
+          <caret line="45" column="0" lean-forward="true" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="63">
+          <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="e#832#1245#0" expanded="true" />
-            <element signature="e#1244#1245#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="5" column="33" lean-forward="true" selection-start-line="5" selection-start-column="33" selection-end-line="5" selection-end-column="33" />
+        <state relative-caret-position="84">
+          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
-          <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="473">
-          <caret line="60" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="410">
-          <caret line="66" column="33" lean-forward="true" selection-start-line="66" selection-start-column="33" selection-end-line="66" selection-end-column="33" />
+        <state relative-caret-position="203">
+          <caret line="14" column="13" lean-forward="false" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#655#663#0" expanded="true" />
@@ -1398,6 +1407,21 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Game.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="328">
+          <caret line="108" column="45" lean-forward="true" selection-start-line="108" selection-start-column="45" selection-end-line="108" selection-end-column="45" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#456#464#0" expanded="true" />
+            <element signature="e#533#541#0" expanded="true" />
+            <element signature="e#623#630#0" expanded="true" />
+            <element signature="e#2115#2116#0" expanded="true" />
+            <element signature="e#2142#2143#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/Client/src/com/texttwist/client/pages/Game.java b/Client/src/com/texttwist/client/pages/Game.java
new file mode 100644
index 0000000..521ee5d
--- /dev/null
+++ b/Client/src/com/texttwist/client/pages/Game.java
@@ -0,0 +1,142 @@
+package com.texttwist.client.pages;
+
+import com.texttwist.client.constants.Palette;
+import com.texttwist.client.ui.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.io.IOException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ThreadLocalRandom;
+
+/**
+ * Created by loke on 14/06/2017.
+ */
+public class Game extends Page {
+
+    private TTContainer gamecontainer;
+    private DefaultListModel<String> letters = new DefaultListModel<String>();
+    private DefaultListModel<String> words = new DefaultListModel<String>();
+    private DefaultListModel<Point> letterSpawningPoint = new DefaultListModel<Point>();
+
+    public Game(JFrame window) throws IOException {
+        super(window);
+        createUIComponents();
+        letters = fetchLetters();
+        letterSpawningPoint = setLetterSpawningPoint();
+        showLetters();
+        window.setVisible(true);
+    }
+
+    private DefaultListModel<Point> setLetterSpawningPoint(){
+        DefaultListModel l = new DefaultListModel<Point>();
+
+        //FirstRow
+        l.addElement(new Point(100,30));
+        l.addElement(new Point(200,15));
+        l.addElement(new Point(300,30));
+        l.addElement(new Point(400,15));
+        l.addElement(new Point(500,25));
+
+        //SecondRow
+        l.addElement(new Point(15,80));
+        l.addElement(new Point(65,95));
+        l.addElement(new Point(440,80));
+        l.addElement(new Point(500,90));
+
+        //ThirdRow
+        l.addElement(new Point(50,140));
+        l.addElement(new Point(150,130));
+        l.addElement(new Point(250,125));
+        l.addElement(new Point(350,145));
+        l.addElement(new Point(450,140));
+        l.addElement(new Point(550,130));
+
+        return l;
+    }
+
+    private DefaultListModel<String> fetchLetters(){
+        DefaultListModel l = new DefaultListModel<String>();
+        l.addElement("C");
+        l.addElement("A");
+        l.addElement("E");
+        l.addElement("P");
+        l.addElement("C");
+        l.addElement("I");
+        l.addElement("L");
+        l.addElement("S");
+
+        return l;
+    }
+
+    private Callable<Object> getWords(){
+        return null;
+    }
+
+    public boolean addWordToWordsList(String word) {
+        words.addElement(word);
+        return true;
+    }
+
+    private Point getRandomPosition(){
+        if(letterSpawningPoint.size()>1) {
+            int index = ThreadLocalRandom.current().nextInt(0, letterSpawningPoint.size() - 1);
+            System.out.println(index);
+            Point placeholder = letterSpawningPoint.get(index);
+            letterSpawningPoint.remove(index);
+            return placeholder;
+        }
+        return new Point(0,0);
+    }
+
+    public void showLetters(){
+        for(int i = 0; i< letters.size(); i++){
+            TTLetter letter = new TTLetter(
+                    getRandomPosition(),
+                    letters.get(i),
+                    gamecontainer);
+        }
+        window.repaint();
+        window.revalidate();
+    }
+
+    @Override
+    public void createUIComponents() throws IOException {
+        addLogo(root);
+        gamecontainer = new TTContainer(
+                null,
+                new Dimension(1150,220),
+                Palette.root_backgroundColor,
+                -1,
+                root);
+
+
+        TTGameBox searchUserBar = new TTGameBox(
+                new Point(150, 90),
+                new Dimension(250, 40),
+                "Word!",
+                new DefaultListModel(),
+                getWords(),
+                gamecontainer);
+
+        addFooter(root);
+        addNext(footer,
+                new Font(Palette.inputBox_font.getFontName(), Font.BOLD, 70),
+                null,
+                "Done!",
+                new Callable<Object>() {
+                    @Override
+                    public Object call() throws Exception {
+                        return new Menu(Page.window);
+                    }
+                });
+
+        addTimer(footer,
+                new Font(Palette.inputBox_font.getFontName(), Font.BOLD, 40),
+                null,
+                "00:00");
+
+    }
+
+
+}
diff --git a/Client/src/com/texttwist/client/pages/Highscores.java b/Client/src/com/texttwist/client/pages/Highscores.java
index f2a1965..427da59 100644
--- a/Client/src/com/texttwist/client/pages/Highscores.java
+++ b/Client/src/com/texttwist/client/pages/Highscores.java
@@ -23,26 +23,23 @@ public class Highscores extends Page{
 
     private DefaultListModel fetchHighscores(){
         DefaultListModel<String> highscoreList = new DefaultListModel<String>();
-        highscoreList.addElement("USA");
-        highscoreList.addElement("India");
-        highscoreList.addElement("Vietnam");
-        highscoreList.addElement("Canada");
-        highscoreList.addElement("Denmark");
-        highscoreList.addElement("France");
-
-        highscoreList.addElement("France");
-        highscoreList.addElement("Great Britain");
-        highscoreList.addElement("Japan");
-
-        highscoreList.addElement("France");
-        highscoreList.addElement("Great Britain");
-        highscoreList.addElement("Japan");
-
-        highscoreList.addElement("France");
-        highscoreList.addElement("Great Britain");
-        highscoreList.addElement("Japan");
-        highscoreList.addElement("Great Britain");
-        highscoreList.addElement("Japan");
+        highscoreList.addElement("Pippo 41");
+        highscoreList.addElement("Paperino 37");
+        highscoreList.addElement("Gaia 34");
+        highscoreList.addElement("Luigi 32");
+        highscoreList.addElement("Marco 31");
+        highscoreList.addElement("Minnie 30");
+        highscoreList.addElement("Franco 30");
+        highscoreList.addElement("Qua 29");
+        highscoreList.addElement("Luca 27");
+        highscoreList.addElement("Qui 26");
+        highscoreList.addElement("Jorge 25");
+        highscoreList.addElement("David 22");
+        highscoreList.addElement("Quo 21");
+        highscoreList.addElement("Raphael 21");
+        highscoreList.addElement("Miguel 16");
+        highscoreList.addElement("Carmen 14");
+        highscoreList.addElement("Beatriz 12");
         return highscoreList;
     }
     @Override
@@ -64,11 +61,13 @@ public class Highscores extends Page{
                 highscoreContainer);
 
         TTScrollList highscoreList = new TTScrollList(
-                new Point(0, 60),
-                new Dimension(575, 142),
+                new Point(20, 60),
+                new Dimension(515, 142),
                 fetchHighscores(),
                 highscoreContainer);
-        addBack(root,
+        addFooter(root);
+
+        addBack(footer,
                 new Callable<Object>() {
                     @Override
                     public Object call() throws Exception {
diff --git a/Client/src/com/texttwist/client/pages/Home.java b/Client/src/com/texttwist/client/pages/Home.java
index 19eb91c..19c5538 100644
--- a/Client/src/com/texttwist/client/pages/Home.java
+++ b/Client/src/com/texttwist/client/pages/Home.java
@@ -28,19 +28,19 @@ public class Home extends Page {
                 root);
 
         TTInputField usernameField = new TTInputField(
-                new Point(70,60),
-                new Dimension(210,50),
+                new Point(50,60),
+                new Dimension(220,50),
                 "Username",
                 loginDataContainer);
 
         TTPasswordField passwordField = new TTPasswordField(
-                new Point(290,60),
-                new Dimension(210,50),
+                new Point(280,60),
+                new Dimension(220,50),
                 loginDataContainer);
 
         TTButton loginBtn = new TTButton(
-                new Point(70,120),
-                new Dimension(430,50),
+                new Point(50,120),
+                new Dimension(450,50),
                 "Go!",
                 new Callable<Object>() {
                     @Override
diff --git a/Client/src/com/texttwist/client/pages/MatchRequests.java b/Client/src/com/texttwist/client/pages/MatchRequests.java
index 7d46ad4..1c2a02f 100644
--- a/Client/src/com/texttwist/client/pages/MatchRequests.java
+++ b/Client/src/com/texttwist/client/pages/MatchRequests.java
@@ -1,12 +1,70 @@
 package com.texttwist.client.pages;
 
+import com.texttwist.client.constants.Palette;
+import com.texttwist.client.ui.*;
+
 import javax.swing.*;
+import java.awt.*;
+import java.io.IOException;
+import java.util.concurrent.Callable;
 
 /**
  * Created by loke on 14/06/2017.
  */
 public class MatchRequests extends Page{
-    public MatchRequests(JFrame window){
+
+    public TTContainer matchsContainer;
+    MatchRequests(JFrame window) throws IOException {
         super(window);
+        createUIComponents();
+        window.setVisible(true);
+    }
+
+    //TODO Spostare i metodi di fetches nella classe MatchRequestService per separare MVC
+    private DefaultListModel fetchMatches(){
+        DefaultListModel<String> matchsList = new DefaultListModel<String>();
+        matchsList.addElement("Pippo ti ha sfidato  -------  Accetta/Declina");
+        matchsList.addElement("Paperino ti ha sfidato  -------  Accetta/Declina");
+        matchsList.addElement("Minnie ti ha sfidato  -------  Accetta/Declina");
+        matchsList.addElement("Luca ti ha sfidato  -------  Accetta/Declina");
+        matchsList.addElement("Gino ti ha sfidato  -------  Accetta/Declina");
+        matchsList.addElement("Filippo ti ha sfidato  -------  Accetta/Declina");
+        matchsList.addElement("Yuri ti ha sfidato  -------  Accetta/Declina");
+        return matchsList;
+    }
+
+    @Override
+    public void createUIComponents() throws IOException {
+        addLogo(root);
+        matchsContainer = new TTContainer(
+                null,
+                new Dimension(1150,220),
+                Palette.root_backgroundColor,
+                -1,
+                root);
+
+        TTLabel title = new TTLabel(
+                new Point(150,0),
+                new Dimension(350,50),
+                "Pending matches",
+                new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 38),
+                null,
+                matchsContainer);
+
+        TTScrollList highscoreList = new TTScrollList(
+                new Point(20, 60),
+                new Dimension(520, 142),
+                fetchMatches(),
+                matchsContainer);
+        addFooter(root);
+
+        addBack(footer,
+                new Callable<Object>() {
+                    @Override
+                    public Object call() throws Exception {
+                        return new Menu(Page.window);
+                    }
+                });
+
     }
 }
diff --git a/Client/src/com/texttwist/client/pages/MatchSetup.java b/Client/src/com/texttwist/client/pages/MatchSetup.java
index f4eaacf..de81b20 100644
--- a/Client/src/com/texttwist/client/pages/MatchSetup.java
+++ b/Client/src/com/texttwist/client/pages/MatchSetup.java
@@ -1,12 +1,120 @@
 package com.texttwist.client.pages;
 
+import com.texttwist.client.constants.Palette;
+import com.texttwist.client.ui.*;
+
 import javax.swing.*;
+import java.awt.*;
+import java.io.IOException;
+import java.util.concurrent.Callable;
 
 /**
  * Created by loke on 14/06/2017.
  */
-public class MatchSetup extends Page {
-    public MatchSetup(JFrame window){
+public class MatchSetup extends Page{
+
+    public TTContainer matchSetupContainer;
+    MatchSetup(JFrame window) throws IOException {
         super(window);
+        createUIComponents();
+        window.setVisible(true);
+    }
+
+    private Callable addUserToInvitationList(){
+        return null;
+    }
+
+    //TODO Spostare i metodi di fetches nella classe MatchSetupService per separare MVC
+    private DefaultListModel fetchUsers(){
+        DefaultListModel<String> usersList = new DefaultListModel<String>();
+        usersList.addElement("Pippo");
+        usersList.addElement("Paperino");
+        usersList.addElement("Gaia");
+        usersList.addElement("Luigi");
+        usersList.addElement("Marco");
+        usersList.addElement("Minnie");
+        usersList.addElement("Franco");
+        usersList.addElement("Qua");
+        usersList.addElement("Luca");
+        usersList.addElement("Qui");
+        usersList.addElement("Jorge");
+        usersList.addElement("David");
+        usersList.addElement("Quo");
+        usersList.addElement("Raphael");
+        usersList.addElement("Miguel");
+        usersList.addElement("Carmen");
+        usersList.addElement("Beatriz");
+        return usersList;
+    }
+
+    @Override
+    public void createUIComponents() throws IOException {
+        addLogo(root);
+
+        matchSetupContainer = new TTContainer(
+                null,
+                new Dimension(1150,220),
+                Palette.root_backgroundColor,
+                -1,
+                root);
+
+        TTLabel title = new TTLabel(
+                new Point(170,0),
+                new Dimension(350,50),
+                "Invite players",
+                new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 38),
+                null,
+                matchSetupContainer);
+
+        TTLabel playerFinder_flavourText = new TTLabel(
+                new Point(20,40),
+                new Dimension(350,50),
+                "<html>Search players to invite...</html>",
+                new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 18),
+                null,
+                matchSetupContainer);
+
+       TTSearchBar searchUserBar = new TTSearchBar(
+               new Point(20, 80),
+               new Dimension(250, 40),
+               "Username",
+               new DefaultListModel(),
+               addUserToInvitationList(),
+               matchSetupContainer);
+
+        TTLabel playerToSendInvite_flavourText = new TTLabel(
+                new Point(305,40),
+                new Dimension(350,50),
+                "Click on user for remove it",
+                new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 18),
+                null,
+                matchSetupContainer);
+
+        TTScrollList playerToSendInvite = new TTScrollList(
+                new Point(305, 80),
+                new Dimension(232, 135),
+                new DefaultListModel(),
+                matchSetupContainer);
+
+        addFooter(root);
+        addNext(footer,
+                new Font(Palette.inputBox_font.getFontName(), Font.BOLD, 40),
+                null,
+                "Play!",
+                new Callable<Object>() {
+                    @Override
+                    public Object call() throws Exception {
+                        return new Game(Page.window);
+                    }
+                });
+
+        addBack(footer,
+                new Callable<Object>() {
+                    @Override
+                    public Object call() throws Exception {
+                        return new Menu(Page.window);
+                    }
+                });
+
     }
 }
diff --git a/Client/src/com/texttwist/client/pages/Menu.java b/Client/src/com/texttwist/client/pages/Menu.java
index bb20daa..26fdd6d 100644
--- a/Client/src/com/texttwist/client/pages/Menu.java
+++ b/Client/src/com/texttwist/client/pages/Menu.java
@@ -84,7 +84,9 @@ public class Menu extends Page{
                     }
                 },
                 menuBar);
-        addBack(root,
+
+        addFooter(root);
+        addBack(footer,
                 new Callable<Object>() {
                 @Override
                 public Object call() throws Exception {
diff --git a/Client/src/com/texttwist/client/pages/Page.java b/Client/src/com/texttwist/client/pages/Page.java
index 9eaa553..62f6398 100644
--- a/Client/src/com/texttwist/client/pages/Page.java
+++ b/Client/src/com/texttwist/client/pages/Page.java
@@ -1,10 +1,7 @@
 package com.texttwist.client.pages;
 
 import com.texttwist.client.constants.Palette;
-import com.texttwist.client.ui.TTContainer;
-import com.texttwist.client.ui.TTImage;
-import com.texttwist.client.ui.TTImageBtn;
-import com.texttwist.client.ui.TTLabel;
+import com.texttwist.client.ui.*;
 
 import javax.swing.*;
 import java.awt.*;
@@ -18,6 +15,7 @@ import java.util.concurrent.Callable;
 public class Page {
 
     public TTContainer root;
+    public TTContainer footer;
     public static JFrame window;
 
     public Page(JFrame window){
@@ -60,21 +58,46 @@ public class Page {
     public void addBack(TTContainer parent, Callable<Object> clickHandler) {
         try {
             TTImageBtn back = new TTImageBtn(
-                    new Point(0, 800),
-                    new Dimension(0, 0),
+                    new Point(0, 0),
+                    new Dimension(50, 50),
                     new ImageIcon(new File("./Client/resources/images/back.png").getCanonicalPath()),
                     clickHandler,
                     parent);
-            TTLabel registerText = new TTLabel(
-                    new Point(55,775),
-                    new Dimension(350,0),
-                    "Back",
-                    new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 24),
-                    null,
-                    parent);
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
 
+    public void addFooter(TTContainer root) {
+        footer = new TTContainer(
+                null,
+                new Dimension(1150, 60),
+                Palette.root_backgroundColor,
+                -1,
+                root);
+    }
+
+    public void addNext(TTContainer parent, Font font, Color fontColor, String caption, Callable<Object> clickHandler) {
+        TTLabelBtn next = new TTLabelBtn(
+                new Point(500, 0),
+                new Dimension(150, 50),
+                caption,
+                null,
+                null,
+                clickHandler,
+                parent);
+    }
+
+    public void addTimer(TTContainer parent, Font font, Color fontColor, String caption) {
+        TTLabel next = new TTLabel(
+                new Point(0, 0),
+                new Dimension(150, 50),
+                caption,
+                font,
+                fontColor,
+                parent);
+    }
+
+
+
 }
diff --git a/Client/src/com/texttwist/client/pages/Register.java b/Client/src/com/texttwist/client/pages/Register.java
index 01b2692..937de45 100644
--- a/Client/src/com/texttwist/client/pages/Register.java
+++ b/Client/src/com/texttwist/client/pages/Register.java
@@ -57,7 +57,8 @@ public class Register extends Page {
                     }
                 },
                 registerDataContainer);
-        addBack(root,
+        addFooter(root);
+        addBack(footer,
             new Callable<Object>() {
                 @Override
                 public Object call() throws Exception {
diff --git a/Client/src/com/texttwist/client/ui/TTGameBox.java b/Client/src/com/texttwist/client/ui/TTGameBox.java
new file mode 100644
index 0000000..ca4cbd4
--- /dev/null
+++ b/Client/src/com/texttwist/client/ui/TTGameBox.java
@@ -0,0 +1,42 @@
+package com.texttwist.client.ui;
+import com.texttwist.client.constants.Palette;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.concurrent.Callable;
+
+
+/**
+ * Created by loke on 14/06/2017.
+ */
+public class TTGameBox extends TTInputField{
+
+    private DefaultListModel words = new DefaultListModel();
+    public TTGameBox(Point position,
+                       Dimension dimension,
+                       String placeholer,
+                       DefaultListModel listModel,
+                       Callable<Object> clickHandler,
+                       TTContainer parent){
+
+        super(position, dimension, placeholer, parent);
+        setBackground(Palette.scrollPanel_backgroundColor);
+        setFont(Palette.inputBox_font);
+        setBounds(position.x, position.y, dimension.width, dimension.height);
+        setPreferredSize(dimension);
+        setForeground(Palette.fontColor);
+
+        addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent e) {
+                super.keyPressed(e);
+                //Every time i press a key, execute a search of users
+            }
+        });
+
+        parent.add(this);
+    }
+}
diff --git a/Client/src/com/texttwist/client/ui/TTLetter.java b/Client/src/com/texttwist/client/ui/TTLetter.java
new file mode 100644
index 0000000..88af54d
--- /dev/null
+++ b/Client/src/com/texttwist/client/ui/TTLetter.java
@@ -0,0 +1,23 @@
+package com.texttwist.client.ui;
+
+import com.texttwist.client.constants.Palette;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Created by loke on 14/06/2017.
+ */
+public class TTLetter extends TTLabel{
+    public TTLetter(Point position, String caption, JPanel parent) {
+        super(position,
+                new Dimension(50,50),
+                caption,
+                new Font(Palette.inputBox_font.getFontName(), Font.ITALIC, 40),
+                Palette.fontColor,
+                parent);
+        parent.add(this);
+
+    }
+
+}
diff --git a/Client/src/com/texttwist/client/ui/TTSearchBar.java b/Client/src/com/texttwist/client/ui/TTSearchBar.java
new file mode 100644
index 0000000..9c0dbd4
--- /dev/null
+++ b/Client/src/com/texttwist/client/ui/TTSearchBar.java
@@ -0,0 +1,49 @@
+package com.texttwist.client.ui;
+import com.texttwist.client.constants.Palette;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.concurrent.Callable;
+
+
+/**
+ * Created by loke on 14/06/2017.
+ */
+public class TTSearchBar extends TTInputField{
+
+    private DefaultListModel matchedUsers = new DefaultListModel();
+    public TTSearchBar(Point position,
+                       Dimension dimension,
+                       String placeholer,
+                       DefaultListModel listModel,
+                       Callable<Object> clickHandler,
+                       TTContainer parent){
+
+        super(position, dimension, placeholer, parent);
+        setBackground(Palette.scrollPanel_backgroundColor);
+        setFont(Palette.inputBox_font);
+        setBounds(position.x, position.y, dimension.width, dimension.height);
+        setPreferredSize(dimension);
+        setForeground(Palette.fontColor);
+
+        TTScrollList userList = new TTScrollList(
+                new Point(20,120),
+                new Dimension(250,95),
+                matchedUsers,
+                parent
+        );
+
+        addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent e) {
+                super.keyPressed(e);
+                //Every time i press a key, execute a search of users
+            }
+        });
+
+        parent.add(this);
+    }
+}
diff --git a/out/production/Client/com/texttwist/client/pages/Game$1.class b/out/production/Client/com/texttwist/client/pages/Game$1.class
new file mode 100644
index 0000000..e92c7a1
Binary files /dev/null and b/out/production/Client/com/texttwist/client/pages/Game$1.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/Game.class b/out/production/Client/com/texttwist/client/pages/Game.class
new file mode 100644
index 0000000..8cbc21d
Binary files /dev/null and b/out/production/Client/com/texttwist/client/pages/Game.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/Highscores$1.class b/out/production/Client/com/texttwist/client/pages/Highscores$1.class
index 9cd2af9..0558bac 100644
Binary files a/out/production/Client/com/texttwist/client/pages/Highscores$1.class and b/out/production/Client/com/texttwist/client/pages/Highscores$1.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/Highscores.class b/out/production/Client/com/texttwist/client/pages/Highscores.class
index 123eb84..7f3a43b 100644
Binary files a/out/production/Client/com/texttwist/client/pages/Highscores.class and b/out/production/Client/com/texttwist/client/pages/Highscores.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/Home.class b/out/production/Client/com/texttwist/client/pages/Home.class
index c2851f0..171f54d 100644
Binary files a/out/production/Client/com/texttwist/client/pages/Home.class and b/out/production/Client/com/texttwist/client/pages/Home.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/MatchRequests$1.class b/out/production/Client/com/texttwist/client/pages/MatchRequests$1.class
new file mode 100644
index 0000000..d199b0b
Binary files /dev/null and b/out/production/Client/com/texttwist/client/pages/MatchRequests$1.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/MatchRequests.class b/out/production/Client/com/texttwist/client/pages/MatchRequests.class
index 018e41d..c4f880e 100644
Binary files a/out/production/Client/com/texttwist/client/pages/MatchRequests.class and b/out/production/Client/com/texttwist/client/pages/MatchRequests.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/MatchSetup$1.class b/out/production/Client/com/texttwist/client/pages/MatchSetup$1.class
new file mode 100644
index 0000000..782b3c3
Binary files /dev/null and b/out/production/Client/com/texttwist/client/pages/MatchSetup$1.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/MatchSetup$2.class b/out/production/Client/com/texttwist/client/pages/MatchSetup$2.class
new file mode 100644
index 0000000..1debc0f
Binary files /dev/null and b/out/production/Client/com/texttwist/client/pages/MatchSetup$2.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/MatchSetup.class b/out/production/Client/com/texttwist/client/pages/MatchSetup.class
index 4672bfa..63b32dc 100644
Binary files a/out/production/Client/com/texttwist/client/pages/MatchSetup.class and b/out/production/Client/com/texttwist/client/pages/MatchSetup.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/Menu$5.class b/out/production/Client/com/texttwist/client/pages/Menu$5.class
index fea3f15..7c7fd0f 100644
Binary files a/out/production/Client/com/texttwist/client/pages/Menu$5.class and b/out/production/Client/com/texttwist/client/pages/Menu$5.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/Menu.class b/out/production/Client/com/texttwist/client/pages/Menu.class
index 42746f8..887705a 100644
Binary files a/out/production/Client/com/texttwist/client/pages/Menu.class and b/out/production/Client/com/texttwist/client/pages/Menu.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/Page.class b/out/production/Client/com/texttwist/client/pages/Page.class
index e06d959..21bf1e7 100644
Binary files a/out/production/Client/com/texttwist/client/pages/Page.class and b/out/production/Client/com/texttwist/client/pages/Page.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/Register$2.class b/out/production/Client/com/texttwist/client/pages/Register$2.class
index 24da428..22c77e7 100644
Binary files a/out/production/Client/com/texttwist/client/pages/Register$2.class and b/out/production/Client/com/texttwist/client/pages/Register$2.class differ
diff --git a/out/production/Client/com/texttwist/client/pages/Register.class b/out/production/Client/com/texttwist/client/pages/Register.class
index fafafcd..dbaa06e 100644
Binary files a/out/production/Client/com/texttwist/client/pages/Register.class and b/out/production/Client/com/texttwist/client/pages/Register.class differ
diff --git a/out/production/Client/com/texttwist/client/ui/TTGameBox$1.class b/out/production/Client/com/texttwist/client/ui/TTGameBox$1.class
new file mode 100644
index 0000000..62f1b91
Binary files /dev/null and b/out/production/Client/com/texttwist/client/ui/TTGameBox$1.class differ
diff --git a/out/production/Client/com/texttwist/client/ui/TTGameBox.class b/out/production/Client/com/texttwist/client/ui/TTGameBox.class
new file mode 100644
index 0000000..1f68518
Binary files /dev/null and b/out/production/Client/com/texttwist/client/ui/TTGameBox.class differ
diff --git a/out/production/Client/com/texttwist/client/ui/TTLetter.class b/out/production/Client/com/texttwist/client/ui/TTLetter.class
new file mode 100644
index 0000000..919751f
Binary files /dev/null and b/out/production/Client/com/texttwist/client/ui/TTLetter.class differ
diff --git a/out/production/Client/com/texttwist/client/ui/TTSearchBar$1.class b/out/production/Client/com/texttwist/client/ui/TTSearchBar$1.class
new file mode 100644
index 0000000..b61ca73
Binary files /dev/null and b/out/production/Client/com/texttwist/client/ui/TTSearchBar$1.class differ
diff --git a/out/production/Client/com/texttwist/client/ui/TTSearchBar.class b/out/production/Client/com/texttwist/client/ui/TTSearchBar.class
new file mode 100644
index 0000000..fb9ebd4
Binary files /dev/null and b/out/production/Client/com/texttwist/client/ui/TTSearchBar.class differ
diff --git a/out/production/TextTwist/.idea/vcs.xml b/out/production/TextTwist/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/out/production/TextTwist/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/out/production/TextTwist/.idea/workspace.xml b/out/production/TextTwist/.idea/workspace.xml
index 4dd331d..554736c 100644
--- a/out/production/TextTwist/.idea/workspace.xml
+++ b/out/production/TextTwist/.idea/workspace.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="eb36c2e9-c6c6-48da-b007-cd41eccd9e5a" name="Default" comment="" />
+    <list default="true" id="eb36c2e9-c6c6-48da-b007-cd41eccd9e5a" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Highscores$1.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Highscores$1.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Highscores.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/Highscores.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/MatchRequests.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/MatchRequests.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/MatchSetup.class" afterPath="$PROJECT_DIR$/out/production/Client/com/texttwist/client/pages/MatchSetup.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" afterPath="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
+    </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -10,14 +20,19 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="CoverageDataManager">
+    <SUITE FILE_PATH="coverage/TextTwist$Main__1_.coverage" NAME="Main (1) Coverage Results" MODIFIED="1497395192247" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
+      <FILTER>com.texttwist.client.*</FILTER>
+    </SUITE>
+  </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
-      <file leaf-file-name="Home.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Home.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="76">
-              <caret line="14" column="19" lean-forward="true" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" />
+            <state relative-caret-position="1176">
+              <caret line="60" column="0" lean-forward="false" selection-start-line="52" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -25,11 +40,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TTContainer.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
+      <file leaf-file-name="Register.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="63">
-              <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+            <state relative-caret-position="483">
+              <caret line="23" column="22" lean-forward="false" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -37,11 +52,36 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TTLabel.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java">
+      <file leaf-file-name="Page.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="136">
-              <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
+            <state relative-caret-position="651">
+              <caret line="41" column="48" lean-forward="false" selection-start-line="41" selection-start-column="48" selection-end-line="41" selection-end-column="48" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Highscores.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="284">
+              <caret line="27" column="26" lean-forward="false" selection-start-line="27" selection-start-column="26" selection-end-line="27" selection-end-column="26" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#655#663#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TTScrollList.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="95">
+              <caret line="14" column="33" lean-forward="true" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -52,32 +92,59 @@
       <file leaf-file-name="Palette.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
-              <caret line="7" column="22" lean-forward="true" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
+            <state relative-caret-position="84">
+              <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TTPasswordField.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="TTPasswordField.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="52">
-              <caret line="4" column="21" lean-forward="true" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" />
+            <state relative-caret-position="53">
+              <caret line="24" column="36" lean-forward="true" selection-start-line="24" selection-start-column="36" selection-end-line="24" selection-end-column="36" />
               <folding>
-                <element signature="e#639#826#0" expanded="true" />
-                <element signature="e#825#826#0" expanded="true" />
+                <element signature="imports" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
+      <file leaf-file-name="MatchRequests.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="42">
-              <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="294">
+              <caret line="32" column="26" lean-forward="true" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#699#707#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="MatchSetup.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1218">
+              <caret line="58" column="33" lean-forward="true" selection-start-line="58" selection-start-column="33" selection-end-line="58" selection-end-column="33" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#692#700#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="TTSearchBar.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="126">
+              <caret line="6" column="3" lean-forward="true" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="3" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -91,6 +158,9 @@
       </list>
     </option>
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
   <component name="GradleLocalSettings">
     <option name="externalProjectsViewState">
       <projects_view />
@@ -111,15 +181,30 @@
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/com/texttwist/client/pages/Home.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/com/texttwist/client/ui/Image.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/com/texttwist/client/ui/TTImage.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.form" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/PasswordField.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java" />
-        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputBox.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputField.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImageBtn.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTCircleCounter.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java" />
         <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java" />
+        <option value="$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java" />
       </list>
     </option>
   </component>
@@ -135,6 +220,7 @@
     <option name="width" value="1718" />
     <option name="height" value="928" />
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
       <flattenPackages />
@@ -314,6 +400,28 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="TextTwist" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="TextTwist" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="Client" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="resources" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="images" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="TextTwist" />
@@ -347,17 +455,18 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\loke\TextTwist\Client\resources\images" />
       <recent name="C:\Users\loke\TextTwist\Client\img" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\loke\TextTwist\Client\resources\images" />
       <recent name="C:\Users\loke\TextTwist\Client\resources" />
+      <recent name="C:\Users\loke\TextTwist\Client\resources\fonts" />
       <recent name="C:\Users\loke\TextTwist\Client\src\com\texttwist\client\ui" />
       <recent name="C:\Users\loke\TextTwist\Client" />
-      <recent name="C:\Users\loke\TextTwist\Client\src" />
-      <recent name="C:\Users\loke\TextTwist\Client\src\com\texttwist\client\com\texttwist\client\pages" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -796,12 +905,14 @@
       <option name="presentableId" value="Default" />
       <updated>1497277836157</updated>
       <workItem from="1497277840504" duration="21181000" />
-      <workItem from="1497343606634" duration="1649000" />
+      <workItem from="1497343606634" duration="28876000" />
+      <workItem from="1497387626373" duration="13500000" />
+      <workItem from="1497426956018" duration="2403000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="22830000" />
+    <option name="totallyTimeSpent" value="65960000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-1709" y="-107" width="1718" height="928" extended-state="6" />
@@ -810,14 +921,14 @@
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32930845" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32869786" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.37926674" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19216181" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -829,12 +940,13 @@
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39956093" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39949432" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Coverage" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
@@ -845,7 +957,9 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager />
+    <breakpoint-manager>
+      <option name="time" value="4" />
+    </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="antWorkspaceConfiguration">
@@ -853,6 +967,73 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="18" column="0" lean-forward="true" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="20" column="9" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="19" column="28" lean-forward="false" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="9" column="33" lean-forward="true" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="14" column="3" lean-forward="true" selection-start-line="14" selection-start-column="3" selection-end-line="14" selection-end-column="3" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="7" column="18" lean-forward="true" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="273">
@@ -885,7 +1066,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="21">
           <caret line="1" column="36" lean-forward="true" selection-start-line="1" selection-start-column="36" selection-end-line="1" selection-end-column="36" />
-          <folding />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -894,8 +1077,7 @@
         <state relative-caret-position="189">
           <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
           <folding>
-            <element signature="e#639#826#0" expanded="true" />
-            <element signature="e#825#826#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -967,7 +1149,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/resources/logo.png">
+    <entry file="file://$PROJECT_DIR$/Client/resources/images/logo.png">
       <provider selected="true" editor-type-id="images">
         <state />
       </provider>
@@ -979,30 +1161,38 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java" />
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.form" />
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java">
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputField.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="9" column="3" lean-forward="true" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="7" column="22" lean-forward="true" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
+        <state relative-caret-position="84">
+          <caret line="4" column="21" lean-forward="true" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTInputBox.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="63">
+        <state relative-caret-position="221">
           <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#243#244#0" expanded="false" />
+            <element signature="e#274#275#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Program Files/Java/jdk1.8.0_131/src.zip!/java/awt/event/MouseAdapter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-240">
+          <caret line="69" column="22" lean-forward="false" selection-start-line="69" selection-start-column="22" selection-end-line="69" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabel.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="116">
+          <caret line="17" column="43" lean-forward="true" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="43" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -1011,27 +1201,188 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="42">
-          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="336">
+          <caret line="20" column="9" lean-forward="false" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java">
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Entrypoint.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="52">
-          <caret line="4" column="21" lean-forward="true" selection-start-line="4" selection-start-column="21" selection-end-line="4" selection-end-column="21" />
+        <state relative-caret-position="394">
+          <caret line="19" column="24" lean-forward="true" selection-start-line="19" selection-start-column="24" selection-end-line="19" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTContainer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="147">
+          <caret line="15" column="23" lean-forward="true" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
           <folding>
-            <element signature="e#639#826#0" expanded="true" />
-            <element signature="e#825#826#0" expanded="true" />
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImageBtn.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="273">
+          <caret line="13" column="3" lean-forward="true" selection-start-line="13" selection-start-column="3" selection-end-line="13" selection-end-column="3" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#561#945#0" expanded="true" />
+            <element signature="e#944#945#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTLabelBtn.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="25" column="73" lean-forward="true" selection-start-line="25" selection-start-column="73" selection-end-line="25" selection-end-column="73" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTImage.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="347">
+          <caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="22" selection-end-column="25" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTButton.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="263">
+          <caret line="33" column="22" lean-forward="true" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTCircleCounter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="5" column="24" lean-forward="true" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Menu.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="231">
+          <caret line="17" column="22" lean-forward="false" selection-start-line="17" selection-start-column="22" selection-end-line="17" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Page.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="651">
+          <caret line="41" column="48" lean-forward="false" selection-start-line="41" selection-start-column="48" selection-end-line="41" selection-end-column="48" />
+          <folding>
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Home.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="14" column="19" lean-forward="true" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" />
+        <state relative-caret-position="1176">
+          <caret line="60" column="0" lean-forward="false" selection-start-line="52" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Register.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="483">
+          <caret line="23" column="22" lean-forward="false" selection-start-line="23" selection-start-column="22" selection-end-line="23" selection-end-column="22" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchRequests.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="294">
+          <caret line="32" column="26" lean-forward="true" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#699#707#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTSearchBar.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="126">
+          <caret line="6" column="3" lean-forward="true" selection-start-line="6" selection-start-column="3" selection-end-line="6" selection-end-column="3" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/MatchSetup.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1218">
+          <caret line="58" column="33" lean-forward="true" selection-start-line="58" selection-start-column="33" selection-end-line="58" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#692#700#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTScrollList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="95">
+          <caret line="14" column="33" lean-forward="true" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/pages/Highscores.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="284">
+          <caret line="27" column="26" lean-forward="false" selection-start-line="27" selection-start-column="26" selection-end-line="27" selection-end-column="26" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#655#663#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/constants/Palette.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="84">
+          <caret line="4" column="3" lean-forward="true" selection-start-line="4" selection-start-column="3" selection-end-line="4" selection-end-column="3" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Client/src/com/texttwist/client/ui/TTPasswordField.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="53">
+          <caret line="24" column="36" lean-forward="true" selection-start-line="24" selection-start-column="36" selection-end-line="24" selection-end-column="36" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
diff --git a/out/production/TextTwist/README.md b/out/production/TextTwist/README.md
new file mode 100644
index 0000000..af5ffae
--- /dev/null
+++ b/out/production/TextTwist/README.md
@@ -0,0 +1 @@
+# texttwist
\ No newline at end of file