diff --git a/FoxTube/Pages/Inbox.xaml b/FoxTube/Pages/Inbox.xaml
index c6de091..652e8de 100644
--- a/FoxTube/Pages/Inbox.xaml
+++ b/FoxTube/Pages/Inbox.xaml
@@ -9,10 +9,49 @@
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
-    <Grid>
+    <Grid Name="grid">
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup>
+                <VisualState>
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="1500"/>
+                    </VisualState.StateTriggers>
+
+                    <VisualState.Setters>
+                        <Setter Target="grid.ColumnDefinitions[0].Width" Value="*"/>
+                        <Setter Target="grid.ColumnDefinitions[1].Width" Value="3*"/>
+                        <Setter Target="close.Visibility" Value="Collapsed"/>
+                    </VisualState.Setters>
+                </VisualState>
+                
+                <VisualState>
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="1000"/>
+                    </VisualState.StateTriggers>
+
+                    <VisualState.Setters>
+                        <Setter Target="grid.ColumnDefinitions[0].Width" Value="*"/>
+                        <Setter Target="grid.ColumnDefinitions[1].Width" Value="2*"/>
+                        <Setter Target="close.Visibility" Value="Collapsed"/>
+                    </VisualState.Setters>
+                </VisualState>
+
+                <VisualState>
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="800"/>
+                    </VisualState.StateTriggers>
+
+                    <VisualState.Setters>
+                        <Setter Target="grid.ColumnDefinitions[0].Width" Value="*"/>
+                        <Setter Target="grid.ColumnDefinitions[1].Width" Value="*"/>
+                        <Setter Target="close.Visibility" Value="Collapsed"/>
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
         <Grid.ColumnDefinitions>
             <ColumnDefinition/>
-            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="0"/>
         </Grid.ColumnDefinitions>
         <ScrollViewer>
             <StackPanel VerticalAlignment="Stretch" Background="#FFF2F2F2">
@@ -58,10 +97,11 @@
                 <controls:MarkdownTextBlock IsTextSelectionEnabled="True" Text="Content" Name="content"/>
             </StackPanel>
         </ScrollViewer>
+        <Button Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Background="Transparent" FontFamily="Segoe MDL2 Assets" Content="&#xE106;" Width="50" Height="50" Name="close" Click="close_Click"/>
         <Grid Grid.Column="1" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" Name="block">
             <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
-                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE7EA;" FontSize="75" Foreground="Gray" Margin="10"/>
-                <TextBlock Text="Select item from list" FontSize="32" VerticalAlignment="Center" Foreground="Gray"/>
+                <TextBlock FontFamily="Segoe MDL2 Assets" Text="&#xE7EA;" FontSize="70" Foreground="Gray" Margin="10"/>
+                <TextBlock Text="Select item from list" FontSize="30" VerticalAlignment="Center" Foreground="Gray"/>
             </StackPanel>
         </Grid>
     </Grid>
diff --git a/FoxTube/Pages/Inbox.xaml.cs b/FoxTube/Pages/Inbox.xaml.cs
index 5ce6108..a40360d 100644
--- a/FoxTube/Pages/Inbox.xaml.cs
+++ b/FoxTube/Pages/Inbox.xaml.cs
@@ -15,6 +15,7 @@ using Windows.UI.Xaml.Navigation;
 using FoxTube.Classes;
 using System.Xml;
 using Windows.Storage;
+using System.Diagnostics;
 
 // The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 
@@ -71,6 +72,8 @@ namespace FoxTube.Pages
             try
             {
                 items.Clear();
+                list.ItemsSource = null;
+
                 switch (filter.SelectedIndex)
                 {
                     case 0:
@@ -90,6 +93,7 @@ namespace FoxTube.Pages
                                 items.Add(i);
                         break;
                 }
+
                 list.ItemsSource = items;
             }
             catch(NullReferenceException) { }
@@ -98,7 +102,16 @@ namespace FoxTube.Pages
         private void list_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             InboxItem item = list.SelectedItem as InboxItem;
-            OpenView(item.Title, item.Content);
+            if(list.SelectedItem != null)
+            {
+                OpenView(item.Title, item.Content);
+                if (grid.ColumnDefinitions[1].Width.Value == 0)
+                {
+                    grid.ColumnDefinitions[0].Width = new GridLength(0);
+                    grid.ColumnDefinitions[1].Width = new GridLength(1, GridUnitType.Star);
+                    Debug.WriteLine("Opened");
+                }
+            }
         }
 
         void CloseView()
@@ -114,5 +127,16 @@ namespace FoxTube.Pages
             title.Text = header;
             block.Visibility = Visibility.Collapsed;
         }
+
+        private void close_Click(object sender, RoutedEventArgs e)
+        {
+            CloseView();
+            if (grid.ColumnDefinitions[0].Width.Value == 0)
+            {
+                grid.ColumnDefinitions[0].Width = new GridLength(1, GridUnitType.Star);
+                grid.ColumnDefinitions[1].Width = new GridLength(0);
+                Debug.WriteLine("Closed");
+            }
+        }
     }
 }