diff --git a/WMstodon/ImageViewerPage.xaml.cs b/WMstodon/ImageViewerPage.xaml.cs
index 2f0e7ad..3411c40 100644
--- a/WMstodon/ImageViewerPage.xaml.cs
+++ b/WMstodon/ImageViewerPage.xaml.cs
@@ -1,16 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
-using Windows.Foundation;
-using Windows.Foundation.Collections;
+
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Media.Imaging;
 using Windows.UI.Xaml.Navigation;
 
diff --git a/WMstodon/MainPage.xaml b/WMstodon/MainPage.xaml
index a4e4f3a..8d634ff 100644
--- a/WMstodon/MainPage.xaml
+++ b/WMstodon/MainPage.xaml
@@ -12,7 +12,7 @@
         <ListView x:Name="feedListView" Margin="0,0,0,60" ItemsSource="{x:Bind Statuses}" SelectionChanged="FeedListView_SelectionChanged">
             <ListView.ItemTemplate>
                 <DataTemplate x:DataType="local:Status">
-                    <Grid Width="Auto" Height="Auto" Padding="0,3,0,3" Margin="0,0,0,15">
+                    <Grid Width="Auto" Height="Auto" Padding="0,10" Margin="0,0,0,15">
                         <Image HorizontalAlignment="Left" Height="32" Margin="0,0,0,0" VerticalAlignment="Top" Width="32">
                             <Image.Source>
                                 <BitmapImage UriSource="{x:Bind account.avatar_static}" />
@@ -20,8 +20,8 @@
                         </Image>
                         <TextBlock Text="{x:Bind account.display_name}" Margin="36,0,0,0" FontSize="12"/>
                         <TextBlock Text="{x:Bind account.acct}" Margin="36,15,0,0" FontSize="12" Foreground="#FF777777"/>
-                        <TextBlock Text="{x:Bind content}" Margin="0,30,0,0" FontSize="15" TextWrapping="Wrap" Height="Auto"/>
-                        <TextBlock Text="{x:Bind additional}" Margin="0,0,0,-15" FontSize="12" Foreground="#FF777777" VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+                        <TextBlock Text="{x:Bind content}" Margin="0,35,0,0" FontSize="15" TextWrapping="Wrap" Height="Auto"/>
+                        <TextBlock Text="{x:Bind additional}" Margin="0,0,0,-20" FontSize="12" Foreground="#FF777777" VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
                     </Grid>
                 </DataTemplate>
             </ListView.ItemTemplate>
@@ -30,7 +30,9 @@
             <Image x:Name="AvatarImage" HorizontalAlignment="Left" Height="40" Margin="10,0,0,0" VerticalAlignment="Center" Width="40"/>
             <TextBlock x:Name="DisplayNameTextBlock" HorizontalAlignment="Left" Margin="60,0,0,30" TextWrapping="Wrap" Text="Loading..." VerticalAlignment="Bottom"/>
             <TextBlock x:Name="UsernameTextBlock" HorizontalAlignment="Left" Margin="60,0,0,15" TextWrapping="Wrap" Text="Loading..." VerticalAlignment="Bottom" FontSize="12" Foreground="#FF777777"/>
-            <Button x:Name="LogOutButton" Content="Log Out" HorizontalAlignment="Right" Margin="0,0,10,0" VerticalAlignment="Center" Width="75" Click="LogOutButton_Click"/>
+            <Button x:Name="LogOutButton" Content="&#xF3B1;" HorizontalAlignment="Right" Margin="0,0,10,0" VerticalAlignment="Center" Width="40" Click="LogOutButton_Click" Background="#00000000" FontFamily="Segoe MDL2 Assets" Height="40" FontSize="24" Padding="0"/>
+            <Button x:Name="RefreshButton" Content="&#xE72C;" HorizontalAlignment="Right" Margin="0,0,60,0" VerticalAlignment="Center" Width="40" Click="RefreshButton_Click" Background="#00000000" FontFamily="Segoe MDL2 Assets" Height="40" FontSize="24" Padding="0"/>
+            <Button x:Name="NewPostButton" Content="&#xE710;" HorizontalAlignment="Right" Margin="0,0,110,0" VerticalAlignment="Center" Width="40" Click="NewPostButton_Click" Background="#00000000" FontFamily="Segoe MDL2 Assets" Height="40" FontSize="24" Padding="0"/>
         </Grid>
     </Grid>
 </Page>
diff --git a/WMstodon/MainPage.xaml.cs b/WMstodon/MainPage.xaml.cs
index bfbeb63..4793a23 100644
--- a/WMstodon/MainPage.xaml.cs
+++ b/WMstodon/MainPage.xaml.cs
@@ -93,5 +93,15 @@ namespace WMstodon
             Status passedStatus = (Status)feedListView.SelectedItem;
             Frame.Navigate(typeof(StatusPage), passedStatus.url);
         }
+
+        private void RefreshButton_Click(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(MainPage), null);
+        }
+
+        private void NewPostButton_Click(object sender, RoutedEventArgs e)
+        {
+            Frame.Navigate(typeof(NewStatusPage), null);
+        }
     }
 }
diff --git a/WMstodon/NewStatusPage.xaml b/WMstodon/NewStatusPage.xaml
new file mode 100644
index 0000000..fec0943
--- /dev/null
+++ b/WMstodon/NewStatusPage.xaml
@@ -0,0 +1,17 @@
+<Page
+    x:Class="WMstodon.NewStatusPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:WMstodon"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid>
+        <Button x:Name="BackButton" Content="Back" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="75"/>
+        <Button x:Name="PostButton" Content="Post" HorizontalAlignment="Right" Margin="0,10,10,0" VerticalAlignment="Top" Width="75"/>
+        <TextBox x:Name="StatusTextBox" Margin="10,47,10,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Height="200" PlaceholderText="Status Text"/>
+
+    </Grid>
+</Page>
diff --git a/WMstodon/NewStatusPage.xaml.cs b/WMstodon/NewStatusPage.xaml.cs
new file mode 100644
index 0000000..4132d43
--- /dev/null
+++ b/WMstodon/NewStatusPage.xaml.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+namespace WMstodon
+{
+    public sealed partial class NewStatusPage : Page
+    {
+        public NewStatusPage()
+        {
+            this.InitializeComponent();
+        }
+
+        protected override void OnNavigatedTo(NavigationEventArgs e)
+        {
+            
+        }
+    }
+}
diff --git a/WMstodon/WMstodon.csproj b/WMstodon/WMstodon.csproj
index 837c990..449db43 100644
--- a/WMstodon/WMstodon.csproj
+++ b/WMstodon/WMstodon.csproj
@@ -130,6 +130,9 @@
     <Compile Include="MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="NewStatusPage.xaml.cs">
+      <DependentUpon>NewStatusPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SelectInstancePage.xaml.cs">
       <DependentUpon>SelectInstancePage.xaml</DependentUpon>
@@ -210,6 +213,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="NewStatusPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SelectInstancePage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>