diff --git a/P2PLauncher/View/MainLauncherWindow.xaml b/P2PLauncher/View/MainLauncherWindow.xaml
index 2db1675..8195214 100644
--- a/P2PLauncher/View/MainLauncherWindow.xaml
+++ b/P2PLauncher/View/MainLauncherWindow.xaml
@@ -50,22 +50,26 @@
         <TabControl HorizontalAlignment="Left" Height="297" Margin="10,10,0,0" VerticalAlignment="Top" Width="390">
             <TabItem Header="Host">
                 <Grid Background="#FFE5E5E5">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="31*"/>
+                        <ColumnDefinition Width="97*"/>
+                    </Grid.ColumnDefinitions>
                     <!-- Buttons Start/Stop -->
-                    <Button Content="Start" Click="OnHostStartClick" HorizontalAlignment="Left" Margin="219,239,0,0" VerticalAlignment="Top" Width="75"/>
-                    <Button Content="Stop" Click="OnFreeLanStopClick" HorizontalAlignment="Left" Margin="299,239,0,0" VerticalAlignment="Top" Width="75"/>
+                    <Button Content="Start" Click="OnHostStartClick" HorizontalAlignment="Left" Margin="125.667,239,0,0" VerticalAlignment="Top" Width="75" Grid.Column="1"/>
+                    <Button Content="Stop" Click="OnFreeLanStopClick" HorizontalAlignment="Left" Margin="205.667,239,0,0" VerticalAlignment="Top" Width="75" Grid.Column="1"/>
 
                     <!-- Password -->
                     <Label Content="Password:" HorizontalAlignment="Left" Margin="11,15,0,0" VerticalAlignment="Top"/>
-                    <TextBox x:Name="TextBoxHostPassword" HorizontalAlignment="Left" Height="23" Margin="76,18,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="120"/>
-                    <Label Content="Enter the password, clients will need to enter to join to you." HorizontalAlignment="Left" Margin="11,41,0,0" VerticalAlignment="Top" FontSize="10" FontStyle="Italic"/>
+                    <TextBox x:Name="TextBoxHostPassword" HorizontalAlignment="Left" Height="23" Margin="76,18,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="120" Grid.ColumnSpan="2"/>
+                    <Label Content="Enter the password, clients will need to enter to join to you." HorizontalAlignment="Left" Margin="11,41,0,0" VerticalAlignment="Top" FontSize="10" FontStyle="Italic" Grid.ColumnSpan="2"/>
 
                     <!-- Relay -->
                     <CheckBox x:Name="CheckBoxHostRelay" IsChecked="True" Content="Relay mode" HorizontalAlignment="Left" Margin="11,69,0,0" VerticalAlignment="Top"/>
-                    <Label Content="Relay mode (advanced)." HorizontalAlignment="Left" Margin="11,84,0,0" VerticalAlignment="Top" FontSize="10" FontStyle="Italic"/>
+                    <Label Content="Relay Mode: Enabled for hosts by default (Advanced)" HorizontalAlignment="Left" Margin="10,84,0,0" VerticalAlignment="Top" FontSize="10" FontStyle="Italic" Grid.ColumnSpan="2"/>
 
                     <!-- Tips -->
-                    <Label Content="Your IP as host will be: 9.0.0.1" HorizontalAlignment="Left" Margin="11,127,0,0" VerticalAlignment="Top" FontSize="10" FontStyle="Italic"/>
-                    <Label Content="If no one can connect to you, try to forward port 12000 UDP" HorizontalAlignment="Left" Margin="10,150,0,0" VerticalAlignment="Top" FontSize="10" FontStyle="Italic"/>
+                    <Label Content="Your IP as host will be: 9.0.0.1" HorizontalAlignment="Left" Margin="11,127,0,0" VerticalAlignment="Top" FontSize="10" FontStyle="Italic" Grid.ColumnSpan="2"/>
+                    <Label Content="If no one can connect to you, try to forward port 12000 UDP" HorizontalAlignment="Left" Margin="10,150,0,0" VerticalAlignment="Top" FontSize="10" FontStyle="Italic" Grid.ColumnSpan="2"/>
 
                 </Grid>
             </TabItem>
@@ -92,7 +96,7 @@
 
                     <!-- Relay -->
                     <CheckBox x:Name="CheckBoxClientRelay" IsChecked="False" Content="Relay mode" HorizontalAlignment="Left" Margin="14,170,0,0" VerticalAlignment="Top" Grid.ColumnSpan="2"/>
-                    <Label Content="Relay mode (advanced)." HorizontalAlignment="Left" Margin="14,185,0,0" VerticalAlignment="Top" FontSize="10" FontStyle="Italic" Grid.ColumnSpan="2"/>
+                    <Label Content="Relay Mode: Disabled for clients by default (Advanced)" HorizontalAlignment="Left" Margin="10,185,0,0" VerticalAlignment="Top" FontSize="10" FontStyle="Italic"/>
 
                 </Grid>
             </TabItem>
@@ -111,6 +115,10 @@
                     <!-- Buttons Start/Stop -->
                     <Button Content="Start" Click="OnHubStartClick" HorizontalAlignment="Left" Margin="220,239,0,0" VerticalAlignment="Top" Width="74"/>
                     <Button Content="Stop" Click="OnFreeLanStopClick"  HorizontalAlignment="Left" Margin="299,239,0,0" VerticalAlignment="Top" Width="75"/>
+
+                    <!-- Tips -->
+                    <Label Content="What are HUBs?&#10;Hubs are networks ran by a communities that allow clients to join and connect with others without needing to rely on UPnP or Port Forwarding.&#10;Don't be alarmed if your internet cuts out for a moment when joining a HUB!&#10;This is normal as it takes a few moments to receive an IP address from their&#10;DHCP server." HorizontalAlignment="Left" Margin="11,127,0,0" VerticalAlignment="Top" FontSize="10" FontStyle="Italic"/>
+
                 </Grid>
             </TabItem>
             <TabItem Header="Donators">