diff --git a/CheatPane.xaml b/CheatPane.xaml
index f663655..ba8a757 100644
--- a/CheatPane.xaml
+++ b/CheatPane.xaml
@@ -17,13 +17,13 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-        <ctl:PageHeader>
+        <!--<ctl:PageHeader>
             <ctl:PageHeader.HeaderContent>
                 <TextBlock x:Name="title" 
                            Style="{ThemeResource PageTitleTextBlockStyle}" Text="CHEATS"/>
             </ctl:PageHeader.HeaderContent>
-        </ctl:PageHeader>
-        <Grid Grid.Row="1">
+        </ctl:PageHeader>-->
+        <Grid Grid.Row="1" Margin="8,0,0,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="auto" />
                 <ColumnDefinition Width="*" />
@@ -31,27 +31,33 @@
 
             <Border Grid.Column="0" BorderThickness="0 0 1 0" BorderBrush="Black" />
             <Border Grid.Column="1" BorderThickness="1 0 0 0" BorderBrush="Black" />
-            <TextBlock Grid.Column="1" Margin="10,20,0,0" Text="Cheat codes" FontSize="22" VerticalAlignment="Top" Height="28" HorizontalAlignment="Left"/>
+            <TextBlock Grid.Column="1" 
+                       Text="Cheat codes" 
+                       FontSize="23" 
+                       Margin="8,8,0,4"
+                       />
 
-            <Grid Grid.Column="0" Margin="10,20,10,10">
+            <Grid Grid.Column="0" >
                 <Grid.RowDefinitions>
                     <RowDefinition Height="auto" />
                     <RowDefinition Height="auto" />
                     <RowDefinition Height="*"  MaxHeight="280"/>
                     <RowDefinition Height="auto" />
                 </Grid.RowDefinitions>
-                <TextBlock Grid.Row="0" Text="Add new cheat code" Margin="0,0,0,20" FontSize="22" VerticalAlignment="Top" Height="28" HorizontalAlignment="Left"/>
+                <TextBlock Grid.Row="0" Text="Add new code" 
+                           FontSize="23" 
+                           Margin="0,8,0,4"
+                           />
 
                 <TextBlock Grid.Row="1" TextWrapping="Wrap" 
-                       FontSize="20" 
-                       Margin="0,0,0,20" MaxWidth="400"
+                       Margin="0,4,0,4" MaxWidth="400"
                        x:Name="descLabel"
                             Text="seecpp" />
 
                 <Grid Grid.Row="2">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"/>
-                        <RowDefinition Height="*" />
+                        <RowDefinition Height="160" />
                         <RowDefinition Height="auto"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
@@ -59,15 +65,27 @@
                         <ColumnDefinition Width="*" MaxWidth="300"/>
                     </Grid.ColumnDefinitions>
 
-                    <TextBlock Grid.Row="0" Grid.Column="0" FontSize="20" Margin="0,0,0,10"
-                                Text="Description:" VerticalAlignment="Center" />
-                    <TextBlock Grid.Row="1" Grid.Column="0" FontSize="20"
-                                Text="Code" VerticalAlignment="Top"/>
-                    <TextBox Grid.Row="0" Grid.Column="1" Name="descBox" Margin="0,0,0,10" />
-                    <TextBox Grid.Row="1" Grid.Column="1" Name="codeBox" AcceptsReturn="True" />
+                    <TextBlock Grid.Row="0" Grid.Column="0" 
+                                Text="Description:"
+                               VerticalAlignment="Center"
+                                />
+                    <TextBox Grid.Row="0" Grid.Column="1"
+                             Name="descBox" Margin="0,4,0,4" />
+                    <TextBlock Grid.Row="1" Grid.Column="0"
+                                Text="Code:" VerticalAlignment="Top"
+                               Margin="0,4,0,0"/>
 
-                    <Button Grid.Row="3" Content="add" HorizontalAlignment="Stretch" 
-                            Margin="0,10,0,0" Name="addButton" Click="addButton_Click" />
+                    <TextBox 
+                                Name="codeBox" AcceptsReturn="True" 
+                            Grid.Row="1" Grid.Column="1" 
+                                Margin="0,4,0,4"
+                                />
+
+
+                    <Button Grid.Row="3" Content="Add" 
+                            HorizontalAlignment="Stretch" 
+                            Margin="0,4,0,4" Name="addButton"
+                            Click="addButton_Click" />
                 </Grid>
 
             </Grid>
diff --git a/ImportPage.xaml b/ImportPage.xaml
index 64056be..1526998 100644
--- a/ImportPage.xaml
+++ b/ImportPage.xaml
@@ -33,14 +33,16 @@
                       Grid.Row="1">
             <StackPanel >
                 <TextBlock Text="Local storage"
-                                 FontWeight="Bold"
                                 VerticalAlignment="Center"
-                           FontSize="20"
+                           FontSize="23"
+                           Margin="0,8,0,4"
                                   />
-                <TextBlock TextWrapping="Wrap" Text="Instruction: use this option to select a ROM already present on your phone or PC."                                
-                                  />
-                <Button x:Name="chooseFolderbtn" Content="Select ROM folder" 
-                        Click="chooseFolderbtn_Click"/>
+                <TextBlock TextWrapping="Wrap"
+                           Text="Use this option to select a ROM already present on your phone or PC."                                
+                                 Margin=" 0, 4, 0, 4" />
+                <Button x:Name="chooseFolderbtn" Content="Select Folder" 
+                        Click="chooseFolderbtn_Click"
+                        Margin =" 0, 4, 0, 4"/>
                 
             </StackPanel>
         </ScrollViewer>
diff --git a/SelectROMPane.xaml b/SelectROMPane.xaml
index f2ec827..6d3417e 100644
--- a/SelectROMPane.xaml
+++ b/SelectROMPane.xaml
@@ -198,7 +198,7 @@
                                     </StackPanel>-->
                                     <TextBlock 
                                             Text="{Binding FilePath}" 
-                                            FontSize="13"
+                                            FontSize="12"
                                                 />
                                 </StackPanel>
                             </Grid>
diff --git a/SettingsPage.xaml b/SettingsPage.xaml
index 7d52fe3..119f900 100644
--- a/SettingsPage.xaml
+++ b/SettingsPage.xaml
@@ -22,7 +22,7 @@
 
         
         <Pivot Grid.Row="1" >
-            <PivotItem Header="Input">
+            <PivotItem  Header="Input">
                 <ScrollViewer HorizontalScrollBarVisibility="Disabled"
                       VerticalScrollBarVisibility="Auto"
                       >