diff --git a/FoxTube/Feedback.xaml b/FoxTube/Feedback.xaml
index 6af3dff..7b64e65 100644
--- a/FoxTube/Feedback.xaml
+++ b/FoxTube/Feedback.xaml
@@ -17,7 +17,7 @@
             </StackPanel>
             <TextBlock Text="Tell us about it" FontSize="18" Margin="0,10,0,0"/>
             <TextBlock Text="Summarize your issue" Margin="0,10,0,0"/>
-            <TextBox Width="1000" HorizontalAlignment="Left"/>
+            <TextBox Width="1000" MaxWidth="1000" HorizontalAlignment="Left"/>
             <TextBlock Text="Give us more detail (optional)" Margin="0,10,0,0"/>
             <TextBox Width="1000" HorizontalAlignment="Left" Height="200"/>
             <Button Content="Submit feedback"  Margin="0,10,0,0"/>
diff --git a/FoxTube/MainPage.xaml b/FoxTube/MainPage.xaml
index f212191..52d49f4 100644
--- a/FoxTube/MainPage.xaml
+++ b/FoxTube/MainPage.xaml
@@ -31,7 +31,7 @@
                     Grid.Column="0"
                     Click="menuButton_Click"
                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
-            <TextBlock Grid.Column="1" Text="Home" FontSize="20" FontWeight="Bold" Margin="5, 0, 0, 0"  HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White"/>
+            <TextBlock Grid.Column="1" Text="Home" FontSize="20" FontWeight="Bold" Margin="5, 0, 0, 0"  HorizontalAlignment="Left" VerticalAlignment="Center" Foreground="White" Name="headerText"/>
             <Button Name="goLive" Grid.Column="2" ToolTipService.ToolTip="Go to Live!" Visibility="Collapsed"
                         FontFamily="Segoe MDL2 Assets" Content="&#xF081;" Foreground="White"
                         Width="50" Height="50" Background="#00000000" RelativePanel.LeftOf="searchField"/>
diff --git a/FoxTube/MainPage.xaml.cs b/FoxTube/MainPage.xaml.cs
index aa9493e..2a55ecf 100644
--- a/FoxTube/MainPage.xaml.cs
+++ b/FoxTube/MainPage.xaml.cs
@@ -184,24 +184,27 @@ namespace FoxTube
             if(topHamburger.SelectedIndex == 0)
             {
                 content.Navigate(typeof(Home));
+                headerText.Text = "Home";
                 menu.DisplayMode = SplitViewDisplayMode.CompactInline;
                 menu.IsPaneOpen = true;
             }
             else if (bottomHaburger.SelectedIndex == 3)
             {
                 content.Navigate(typeof(Settings));
+                headerText.Text = "Settings";
                 menu.DisplayMode = SplitViewDisplayMode.CompactOverlay;
                 menu.IsPaneOpen = false;
             }
             else if (bottomHaburger.SelectedIndex == 0)
             {
                 content.Navigate(typeof(Channel));
+                headerText.Text = "Channel overview";
                 menu.DisplayMode = SplitViewDisplayMode.CompactOverlay;
                 menu.IsPaneOpen = false;
             }
             else if (bottomHaburger.SelectedIndex == 2)
             {
-                bottomHaburger.SelectedItem = null;
+                topHamburger.SelectedIndex = 0;
             }
         }
 
diff --git a/FoxTube/VideoCard.xaml b/FoxTube/VideoCard.xaml
index 64fcab8..d90f0a5 100644
--- a/FoxTube/VideoCard.xaml
+++ b/FoxTube/VideoCard.xaml
@@ -9,7 +9,7 @@
     d:DesignHeight="290"
     d:DesignWidth="384">
 
-    <Grid Background="WhiteSmoke">
+    <Grid Background="WhiteSmoke" BorderBrush="LightGray" BorderThickness="1" Width="384" Height="290" VerticalAlignment="Top">
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
             <RowDefinition Height="75"/>
diff --git a/FoxTube/VideoGrid.xaml b/FoxTube/VideoGrid.xaml
index a6b97d6..34ad9bc 100644
--- a/FoxTube/VideoGrid.xaml
+++ b/FoxTube/VideoGrid.xaml
@@ -7,13 +7,14 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Padding="5">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="384"/>
-            <ColumnDefinition Width="384"/>
-            <ColumnDefinition Width="384"/>
-            <ColumnDefinition Width="384"/>
-            <ColumnDefinition Width="384"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
+        <local:VideoCard/>
     </Grid>
 </Page>
diff --git a/Src/FoxTubeLogoIcon120.png b/Src/FoxTubeLogoIcon120.png
new file mode 100644
index 0000000..49ddb0e
Binary files /dev/null and b/Src/FoxTubeLogoIcon120.png differ