diff --git a/AnneProKeyboard/KeyboardKey.cs b/AnneProKeyboard/KeyboardKey.cs
index 4faf033..562d3ee 100644
--- a/AnneProKeyboard/KeyboardKey.cs
+++ b/AnneProKeyboard/KeyboardKey.cs
@@ -22,8 +22,8 @@ public class KeyboardKey
         static KeyboardKey()
         {
             // "Empty" key, also the unassigned value key
-            StringKeyboardKeys[""] = new KeyboardKey("", "None", 0);
-            IntKeyboardKeys[0] = StringKeyboardKeys[""];
+            StringKeyboardKeys["None"] = new KeyboardKey("None", "None", 0);
+            IntKeyboardKeys[0] = StringKeyboardKeys["None"];
 
             // "Anne" key
             StringKeyboardKeys["Anne"] = new KeyboardKey("Anne", "Anne", 250);
diff --git a/AnneProKeyboard/KeyboardProfileItem.cs b/AnneProKeyboard/KeyboardProfileItem.cs
index 497e14e..93a6153 100644
--- a/AnneProKeyboard/KeyboardProfileItem.cs
+++ b/AnneProKeyboard/KeyboardProfileItem.cs
@@ -11,6 +11,8 @@ namespace AnneProKeyboard
     [DataContract]
     public class KeyboardProfileItem : INotifyPropertyChanged
     {
+        public EventHandler SyncStatusNotify;
+
         private int _ID;
         [DataMember]
         public int ID
@@ -89,6 +91,7 @@ private bool SpecialKeyExists(List<KeyboardKey> keys)
                 if (key.KeyValue == 250)
                 {
                     anne_key = true;
+                    int index = keys.IndexOf(key);
                 }
                 else if (key.KeyValue == 254)
                 {
@@ -187,7 +190,8 @@ private void SyncProfilePhase1(CoreDispatcher dispatcher, GattCharacteristic gat
             KeyboardWriter keyboard_writer = new KeyboardWriter(dispatcher, gatt, lighting_meta_data, light_data);
             keyboard_writer.WriteToKeyboard();
 
-            keyboard_writer.OnWriteFinished += (object_s, events) => { SyncProfilePhase2(dispatcher, gatt); }; // we need to do this because of async calls, threading is fun!
+            keyboard_writer.OnWriteFinished += (object_s, events) => { SyncProfilePhase2(dispatcher, gatt); NotifyStatus("Keyboard light has been synced");  }; // we need to do this because of async calls, threading is fun!
+            keyboard_writer.OnWriteFailed += (object_s, events) => { NotifyStatus("Failed to sync profile (light): exception handled"); };
         }
 
         // send the layout data
@@ -207,6 +211,18 @@ private void SyncProfilePhase2(CoreDispatcher dispatcher, GattCharacteristic gat
 
             KeyboardWriter keyboard_writer = new KeyboardWriter(dispatcher, gatt, layout_meta_data, layout_data);
             keyboard_writer.WriteToKeyboard();
+
+            keyboard_writer.OnWriteFinished += (object_s, events) => { NotifyStatus("Layout data has been synced"); }; // we need to do this because of async calls, threading is fun!
+            keyboard_writer.OnWriteFailed += (object_s, events) => { NotifyStatus("Failed to sync profile (layout): exception handled"); };
+        }
+
+        private void NotifyStatus(string status)
+        {
+            EventHandler handler = this.SyncStatusNotify;
+            if (handler != null)
+            {
+                handler(status, EventArgs.Empty);
+            }
         }
     }
 }
diff --git a/AnneProKeyboard/MainPage.xaml b/AnneProKeyboard/MainPage.xaml
index 2e41f8b..0a44c47 100644
--- a/AnneProKeyboard/MainPage.xaml
+++ b/AnneProKeyboard/MainPage.xaml
@@ -51,7 +51,7 @@
 
         <Grid Background="#1E1E1E">
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <Pivot x:Name="chosenProfileName">
@@ -67,88 +67,170 @@
                 </Pivot.HeaderTemplate>
                 <PivotItem Header="Layout">
                     <StackPanel Orientation="Vertical" Grid.Row="2">
-                        <StackPanel Orientation="Horizontal" Grid.Row="2" Height="250" Margin="10,0,0,0">
-                            <Grid>
-                                <TextBlock HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" VerticalAlignment="Top" Width="138" FontSize="14" Margin="0,15,0,0">
+                        <ScrollViewer VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Auto">
+                            <StackPanel Orientation="Horizontal" Grid.Row="2" Height="250" Margin="10,0,0,0">
+                                <Grid>
+                                    <TextBlock HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" VerticalAlignment="Top" Width="138" FontSize="14" Margin="0,15,0,0">
                                     <Run Text="Standard"/>
                                     <Run Text="Layout"/>
                                     <Run Text=":"/>
-                                </TextBlock>
+                                    </TextBlock>
 
-                                <RelativePanel Height="40" Margin="0,38,2,172">
-                                    <ComboBox Name="keyboardStandardLayout" Margin="0,0,0,0" SelectionChanged="KeyboardStandardLayout_SelectionChanged" DropDownClosed="KeyboardStandardLayout_DropDownClosed" ItemsSource="{x:Bind KeyboardKeyLabels}" Visibility="Collapsed" HorizontalAlignment="Left" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton0" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton1" Click="KeyboardLayoutButton_Click" Margin="33,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton2" Click="KeyboardLayoutButton_Click" Margin="64,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton3" Click="KeyboardLayoutButton_Click" Margin="95,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton4" Click="KeyboardLayoutButton_Click" Margin="126,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton5" Click="KeyboardLayoutButton_Click" Margin="157,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton6" Click="KeyboardLayoutButton_Click" Margin="188,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton7" Click="KeyboardLayoutButton_Click" Margin="219,5,-4,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton8" Click="KeyboardLayoutButton_Click" Margin="250,5,-5,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton9" Click="KeyboardLayoutButton_Click" Margin="281,5,-7,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton10" Click="KeyboardLayoutButton_Click" Margin="312,5,-8,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton11" Click="KeyboardLayoutButton_Click" Margin="343,5,-9,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton12" Click="KeyboardLayoutButton_Click" Margin="374,5,-10,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton13" Click="KeyboardLayoutButton_Click" Margin="405,5,0,5" HorizontalAlignment="Left" Width="60" Height="30" />
-                                </RelativePanel>
-                                <RelativePanel Height="40" Margin="0,69,0,142">
-                                    <Button Name="keyboardStandardLayoutButton14" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="45" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton15" Click="KeyboardLayoutButton_Click" Margin="48,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton16" Click="KeyboardLayoutButton_Click" Margin="79,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton17" Click="KeyboardLayoutButton_Click" Margin="110,5,-4,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton18" Click="KeyboardLayoutButton_Click" Margin="141,5,-6,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton19" Click="KeyboardLayoutButton_Click" Margin="172,5,-6,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton20" Click="KeyboardLayoutButton_Click" Margin="203,5,-6,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton21" Click="KeyboardLayoutButton_Click" Margin="234,5,-6,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton22" Click="KeyboardLayoutButton_Click" Margin="265,5,-8,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton23" Click="KeyboardLayoutButton_Click" Margin="296,5,-10,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton24" Click="KeyboardLayoutButton_Click" Margin="327,5,-12,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton25" Click="KeyboardLayoutButton_Click" Margin="358,5,-14,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton26" Click="KeyboardLayoutButton_Click" Margin="389,5,-14,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton27" Click="KeyboardLayoutButton_Click" Margin="420,5,-16,5" HorizontalAlignment="Left"  Width="45" Height="30" />
-                                </RelativePanel>
-                                <RelativePanel Height="40" Margin="0,99,0,109" >
-                                    <Button Name="keyboardStandardLayoutButton28" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="52" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton29" Click="KeyboardLayoutButton_Click" Margin="55,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton30" Click="KeyboardLayoutButton_Click" Margin="86,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton31" Click="KeyboardLayoutButton_Click" Margin="117,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton32" Click="KeyboardLayoutButton_Click" Margin="148,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton33" Click="KeyboardLayoutButton_Click" Margin="179,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton34" Click="KeyboardLayoutButton_Click" Margin="210,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton35" Click="KeyboardLayoutButton_Click" Margin="241,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton36" Click="KeyboardLayoutButton_Click" Margin="272,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton37" Click="KeyboardLayoutButton_Click" Margin="303,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton38" Click="KeyboardLayoutButton_Click" Margin="334,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton39" Click="KeyboardLayoutButton_Click" Margin="365,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton40" Click="KeyboardLayoutButton_Click" Margin="396,5,-9.333,5" HorizontalAlignment="Left"  Width="69" Height="30" />
-                                </RelativePanel>
-                                <RelativePanel Height="40" Margin="0,131,0,80">
-                                    <Button Name="keyboardStandardLayoutButton41" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="67"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton42" Click="KeyboardLayoutButton_Click" Margin="70,5,-4,5" HorizontalAlignment="Left"  Width="30"   Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton43" Click="KeyboardLayoutButton_Click" Margin="101,5,-4,5" HorizontalAlignment="Left"  Width="30" Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton44" Click="KeyboardLayoutButton_Click" Margin="132,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton45" Click="KeyboardLayoutButton_Click" Margin="163,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton46" Click="KeyboardLayoutButton_Click" Margin="194,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton47" Click="KeyboardLayoutButton_Click" Margin="225,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton48" Click="KeyboardLayoutButton_Click" Margin="256,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton49" Click="KeyboardLayoutButton_Click" Margin="287,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton50" Click="KeyboardLayoutButton_Click" Margin="318,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton51" Click="KeyboardLayoutButton_Click" Margin="349,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton52" Click="KeyboardLayoutButton_Click" Margin="380,5,-2,5" HorizontalAlignment="Left"  Width="85"  Height="30" />
-                                </RelativePanel>
-                                <RelativePanel Height="40" Margin="0,154,0,40">
-                                    <Button Name="keyboardStandardLayoutButton53" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton54" Click="KeyboardLayoutButton_Click" Margin="41,5,0,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton55" Click="KeyboardLayoutButton_Click" Margin="80,5,0,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton56" Click="KeyboardLayoutButton_Click" Margin="119,5,-10,5" HorizontalAlignment="Left"  Width="188"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton57" Click="KeyboardLayoutButton_Click" Margin="308,5,-12,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton58" Click="KeyboardLayoutButton_Click" Margin="347,5,-10,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton59" Click="KeyboardLayoutButton_Click" Margin="386,5,-10,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
-                                    <Button Name="keyboardStandardLayoutButton60" Click="KeyboardLayoutButton_Click" Margin="425,5,-12,5" HorizontalAlignment="Left"  Width="40" Height="30" />
-                                </RelativePanel>
-                            </Grid>
-                        </StackPanel>
+                                    <RelativePanel Height="40" Margin="0,38,2,172">
+                                        <ComboBox Name="keyboardLayoutSelection" Margin="0,0,0,0" SelectionChanged="KeyboardStandardLayout_SelectionChanged" DropDownClosed="KeyboardStandardLayout_DropDownClosed" ItemsSource="{x:Bind KeyboardKeyLabels}" Visibility="Collapsed" HorizontalAlignment="Left" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton0" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton1" Click="KeyboardLayoutButton_Click" Margin="33,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton2" Click="KeyboardLayoutButton_Click" Margin="64,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton3" Click="KeyboardLayoutButton_Click" Margin="95,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton4" Click="KeyboardLayoutButton_Click" Margin="126,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton5" Click="KeyboardLayoutButton_Click" Margin="157,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton6" Click="KeyboardLayoutButton_Click" Margin="188,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton7" Click="KeyboardLayoutButton_Click" Margin="219,5,-4,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton8" Click="KeyboardLayoutButton_Click" Margin="250,5,-5,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton9" Click="KeyboardLayoutButton_Click" Margin="281,5,-7,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton10" Click="KeyboardLayoutButton_Click" Margin="312,5,-8,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton11" Click="KeyboardLayoutButton_Click" Margin="343,5,-9,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton12" Click="KeyboardLayoutButton_Click" Margin="374,5,-10,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton13" Click="KeyboardLayoutButton_Click" Margin="405,5,0,5" HorizontalAlignment="Left" Width="60" Height="30" />
+                                    </RelativePanel>
+                                    <RelativePanel Height="40" Margin="0,69,0,142">
+                                        <Button Name="keyboardStandardLayoutButton14" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="45" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton15" Click="KeyboardLayoutButton_Click" Margin="48,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton16" Click="KeyboardLayoutButton_Click" Margin="79,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton17" Click="KeyboardLayoutButton_Click" Margin="110,5,-4,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton18" Click="KeyboardLayoutButton_Click" Margin="141,5,-6,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton19" Click="KeyboardLayoutButton_Click" Margin="172,5,-6,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton20" Click="KeyboardLayoutButton_Click" Margin="203,5,-6,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton21" Click="KeyboardLayoutButton_Click" Margin="234,5,-6,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton22" Click="KeyboardLayoutButton_Click" Margin="265,5,-8,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton23" Click="KeyboardLayoutButton_Click" Margin="296,5,-10,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton24" Click="KeyboardLayoutButton_Click" Margin="327,5,-12,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton25" Click="KeyboardLayoutButton_Click" Margin="358,5,-14,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton26" Click="KeyboardLayoutButton_Click" Margin="389,5,-14,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton27" Click="KeyboardLayoutButton_Click" Margin="420,5,-16,5" HorizontalAlignment="Left"  Width="45" Height="30" />
+                                    </RelativePanel>
+                                    <RelativePanel Height="40" Margin="0,99,0,109" >
+                                        <Button Name="keyboardStandardLayoutButton28" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="52" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton29" Click="KeyboardLayoutButton_Click" Margin="55,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton30" Click="KeyboardLayoutButton_Click" Margin="86,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton31" Click="KeyboardLayoutButton_Click" Margin="117,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton32" Click="KeyboardLayoutButton_Click" Margin="148,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton33" Click="KeyboardLayoutButton_Click" Margin="179,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton34" Click="KeyboardLayoutButton_Click" Margin="210,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton35" Click="KeyboardLayoutButton_Click" Margin="241,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton36" Click="KeyboardLayoutButton_Click" Margin="272,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton37" Click="KeyboardLayoutButton_Click" Margin="303,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton38" Click="KeyboardLayoutButton_Click" Margin="334,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton39" Click="KeyboardLayoutButton_Click" Margin="365,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton40" Click="KeyboardLayoutButton_Click" Margin="396,5,-9.333,5" HorizontalAlignment="Left"  Width="69" Height="30" />
+                                    </RelativePanel>
+                                    <RelativePanel Height="40" Margin="0,131,0,80">
+                                        <Button Name="keyboardStandardLayoutButton41" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="67"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton42" Click="KeyboardLayoutButton_Click" Margin="70,5,-4,5" HorizontalAlignment="Left"  Width="30"   Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton43" Click="KeyboardLayoutButton_Click" Margin="101,5,-4,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton44" Click="KeyboardLayoutButton_Click" Margin="132,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton45" Click="KeyboardLayoutButton_Click" Margin="163,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton46" Click="KeyboardLayoutButton_Click" Margin="194,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton47" Click="KeyboardLayoutButton_Click" Margin="225,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton48" Click="KeyboardLayoutButton_Click" Margin="256,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton49" Click="KeyboardLayoutButton_Click" Margin="287,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton50" Click="KeyboardLayoutButton_Click" Margin="318,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton51" Click="KeyboardLayoutButton_Click" Margin="349,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton52" Click="KeyboardLayoutButton_Click" Margin="380,5,-2,5" HorizontalAlignment="Left"  Width="85"  Height="30" />
+                                    </RelativePanel>
+                                    <RelativePanel Height="40" Margin="0,154,0,40">
+                                        <Button Name="keyboardStandardLayoutButton53" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton54" Click="KeyboardLayoutButton_Click" Margin="41,5,0,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton55" Click="KeyboardLayoutButton_Click" Margin="80,5,0,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton56" Click="KeyboardLayoutButton_Click" Margin="119,5,-10,5" HorizontalAlignment="Left"  Width="188"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton57" Click="KeyboardLayoutButton_Click" Margin="308,5,-12,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton58" Click="KeyboardLayoutButton_Click" Margin="347,5,-10,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton59" Click="KeyboardLayoutButton_Click" Margin="386,5,-10,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
+                                        <Button Name="keyboardStandardLayoutButton60" Click="KeyboardLayoutButton_Click" Margin="425,5,-12,5" HorizontalAlignment="Left"  Width="40" Height="30" />
+                                    </RelativePanel>
+                                </Grid>
+
+                                <Grid>
+                                    <TextBlock HorizontalAlignment="Left" Height="23" TextWrapping="Wrap" VerticalAlignment="Top" Width="138" FontSize="14" Margin="0,15,0,0">
+                                    <Run Text="Fn"/>
+                                    <Run Text="Layout"/>
+                                    <Run Text=":"/>
+                                    </TextBlock>
+
+                                    <RelativePanel Height="40" Margin="0,38,2,172">
+                                        <Button Name="keyboardFNLayoutButton0" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton1" Click="KeyboardLayoutButton_Click" Margin="33,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton2" Click="KeyboardLayoutButton_Click" Margin="64,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton3" Click="KeyboardLayoutButton_Click" Margin="95,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton4" Click="KeyboardLayoutButton_Click" Margin="126,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton5" Click="KeyboardLayoutButton_Click" Margin="157,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton6" Click="KeyboardLayoutButton_Click" Margin="188,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton7" Click="KeyboardLayoutButton_Click" Margin="219,5,-4,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton8" Click="KeyboardLayoutButton_Click" Margin="250,5,-5,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton9" Click="KeyboardLayoutButton_Click" Margin="281,5,-7,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton10" Click="KeyboardLayoutButton_Click" Margin="312,5,-8,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton11" Click="KeyboardLayoutButton_Click" Margin="343,5,-9,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton12" Click="KeyboardLayoutButton_Click" Margin="374,5,-10,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton13" Click="KeyboardLayoutButton_Click" Margin="405,5,0,5" HorizontalAlignment="Left" Width="60" Height="30" />
+                                    </RelativePanel>
+                                    <RelativePanel Height="40" Margin="0,69,0,142">
+                                        <Button Name="keyboardFNLayoutButton14" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="45" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton15" Click="KeyboardLayoutButton_Click" Margin="48,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton16" Click="KeyboardLayoutButton_Click" Margin="79,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton17" Click="KeyboardLayoutButton_Click" Margin="110,5,-4,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton18" Click="KeyboardLayoutButton_Click" Margin="141,5,-6,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton19" Click="KeyboardLayoutButton_Click" Margin="172,5,-6,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton20" Click="KeyboardLayoutButton_Click" Margin="203,5,-6,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton21" Click="KeyboardLayoutButton_Click" Margin="234,5,-6,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton22" Click="KeyboardLayoutButton_Click" Margin="265,5,-8,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton23" Click="KeyboardLayoutButton_Click" Margin="296,5,-10,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton24" Click="KeyboardLayoutButton_Click" Margin="327,5,-12,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton25" Click="KeyboardLayoutButton_Click" Margin="358,5,-14,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton26" Click="KeyboardLayoutButton_Click" Margin="389,5,-14,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton27" Click="KeyboardLayoutButton_Click" Margin="420,5,-16,5" HorizontalAlignment="Left"  Width="45" Height="30" />
+                                    </RelativePanel>
+                                    <RelativePanel Height="40" Margin="0,99,0,109" >
+                                        <Button Name="keyboardFNLayoutButton28" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="52" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton29" Click="KeyboardLayoutButton_Click" Margin="55,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton30" Click="KeyboardLayoutButton_Click" Margin="86,5,-2,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton31" Click="KeyboardLayoutButton_Click" Margin="117,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton32" Click="KeyboardLayoutButton_Click" Margin="148,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton33" Click="KeyboardLayoutButton_Click" Margin="179,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton34" Click="KeyboardLayoutButton_Click" Margin="210,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton35" Click="KeyboardLayoutButton_Click" Margin="241,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton36" Click="KeyboardLayoutButton_Click" Margin="272,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton37" Click="KeyboardLayoutButton_Click" Margin="303,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton38" Click="KeyboardLayoutButton_Click" Margin="334,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton39" Click="KeyboardLayoutButton_Click" Margin="365,5,0,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton40" Click="KeyboardLayoutButton_Click" Margin="396,5,-9.333,5" HorizontalAlignment="Left"  Width="69" Height="30" />
+                                    </RelativePanel>
+                                    <RelativePanel Height="40" Margin="0,131,0,80">
+                                        <Button Name="keyboardFNLayoutButton41" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="67"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton42" Click="KeyboardLayoutButton_Click" Margin="70,5,-4,5" HorizontalAlignment="Left"  Width="30"   Height="30" />
+                                        <Button Name="keyboardFNLayoutButton43" Click="KeyboardLayoutButton_Click" Margin="101,5,-4,5" HorizontalAlignment="Left"  Width="30" Height="30" />
+                                        <Button Name="keyboardFNLayoutButton44" Click="KeyboardLayoutButton_Click" Margin="132,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton45" Click="KeyboardLayoutButton_Click" Margin="163,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton46" Click="KeyboardLayoutButton_Click" Margin="194,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton47" Click="KeyboardLayoutButton_Click" Margin="225,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton48" Click="KeyboardLayoutButton_Click" Margin="256,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton49" Click="KeyboardLayoutButton_Click" Margin="287,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton50" Click="KeyboardLayoutButton_Click" Margin="318,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton51" Click="KeyboardLayoutButton_Click" Margin="349,5,0,5" HorizontalAlignment="Left"  Width="30"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton52" Click="KeyboardLayoutButton_Click" Margin="380,5,-2,5" HorizontalAlignment="Left"  Width="85"  Height="30" />
+                                    </RelativePanel>
+                                    <RelativePanel Height="40" Margin="0,154,0,40">
+                                        <Button Name="keyboardFNLayoutButton53" Click="KeyboardLayoutButton_Click" Margin="2,5,0,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton54" Click="KeyboardLayoutButton_Click" Margin="41,5,0,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton55" Click="KeyboardLayoutButton_Click" Margin="80,5,0,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton56" Click="KeyboardLayoutButton_Click" Margin="119,5,-10,5" HorizontalAlignment="Left"  Width="188"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton57" Click="KeyboardLayoutButton_Click" Margin="308,5,-12,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton58" Click="KeyboardLayoutButton_Click" Margin="347,5,-10,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton59" Click="KeyboardLayoutButton_Click" Margin="386,5,-10,5" HorizontalAlignment="Left"  Width="38"  Height="30" />
+                                        <Button Name="keyboardFNLayoutButton60" Click="KeyboardLayoutButton_Click" Margin="425,5,-12,5" HorizontalAlignment="Left"  Width="40" Height="30" />
+                                    </RelativePanel>
+                                </Grid>
+                            </StackPanel>
+                        </ScrollViewer>
                         <Button x:Name="LayoutSyncButton" Content="Sync Profile" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0, 0, 10, 0" IsEnabled="False" Click="KeyboardSyncButton_Click" Height="32" Width="100" />
                     </StackPanel>
                 </PivotItem>
@@ -243,7 +325,10 @@
                     </StackPanel>
                 </PivotItem>
             </Pivot>
-
+            <StackPanel Background="Green" Orientation="Horizontal" Grid.Row="2" DataContext="{Binding ElementName=main}"  Margin="0,21,0,0" Height="30px" >
+                <TextBlock Text="Status: " Foreground="White" Margin="5,0,0,0" VerticalAlignment="Center"/>
+                <TextBlock x:Name="SyncStatus" Text="Waiting for sync..." Margin="10,0,0,0" VerticalAlignment="Center" Foreground="White" />
+            </StackPanel>
         </Grid>
     </SplitView>
 </Page>
diff --git a/AnneProKeyboard/MainPage.xaml.cs b/AnneProKeyboard/MainPage.xaml.cs
index e4aaf26..44a2839 100644
--- a/AnneProKeyboard/MainPage.xaml.cs
+++ b/AnneProKeyboard/MainPage.xaml.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
 using System.IO;
 using System.Runtime.Serialization;
 using System.Collections.Specialized;
@@ -52,6 +51,7 @@ public ObservableCollection<KeyboardProfileItem> KeyboardProfiles
         private Dictionary<String, String> KeyboardKeyLabelTranslation = new Dictionary<String, String>();
 
         private Button CurrentlyEditingStandardKey;
+        private Button CurrentlyEditingFnKey;
 
         public MainPage()
         {
@@ -318,6 +318,14 @@ private void ChangeSelectedProfile(KeyboardProfileItem profile)
                     {
                         layout_button.Content = profile.NormalKeys[i].KeyShortLabel;
                     }
+
+                    string fn_layout_id = "keyboardFNLayoutButton" + i;
+                    Button fn_layout_button = (this.FindName(fn_layout_id) as Button);
+
+                    if (fn_layout_id != null)
+                    {
+                        fn_layout_button.Content = profile.FnKeys[i].KeyShortLabel;
+                    }
                 }
 
                 string s = "keyboardButton" + i;
@@ -433,9 +441,28 @@ private void ProfileDeleteButton_Click(object sender, RoutedEventArgs e)
 
         private void KeyboardSyncButton_Click(object sender, RoutedEventArgs e)
         {
+            if(!this.EditingProfile.ValidateKeyboardKeys())
+            {
+                this.SyncStatus.Text = "Fn or Anne keys were not found in the Standard or Fn layouts";
+                return;
+            }
+            
             this.SaveProfiles();
 
+            this.LayoutSyncButton.IsEnabled = false;
+            this.LightSyncButton.IsEnabled = false;
+
             this.EditingProfile.SyncProfile(this.Dispatcher, this.WriteGatt);
+            this.EditingProfile.SyncStatusNotify += async (object_s, events) =>
+            {
+                await this.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
+                {
+                    this.SyncStatus.Text = (string)object_s;
+
+                    this.LayoutSyncButton.IsEnabled = true;
+                    this.LightSyncButton.IsEnabled = true;
+                });
+            };
         }
         
         private void ProfileNameTextbox_LostFocus(object sender, RoutedEventArgs e)
@@ -470,56 +497,71 @@ private void KeyboardProfiles_CollectionChanged(object sender, NotifyCollectionC
                 }
             }
         }
-
-        private async void LayoutSearch_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
+        
+        private async void KeyboardLayoutButton_Click(object sender, RoutedEventArgs e)
         {
-            string query = sender.Text;
-            // LINQ search is going to be O(n^x) (forn is the size of keys and x is the length of the string)
-            // so lets run it in a background thread without blocking the UI
-            var search_task = Task.Run(() => KeyboardKey.StringKeyboardKeys.Keys.Where(x => x.Contains(query)).Select(x => KeyboardKey.StringKeyboardKeys[x].KeyShortLabel).ToList());
-            var keys = await search_task;
-
-            sender.ItemsSource = keys;
-        }
+            if(this.CurrentlyEditingFnKey != null)
+            {
+                this.CurrentlyEditingFnKey.Visibility = Visibility.Visible;
+                this.CurrentlyEditingFnKey = null;
+            }
 
-        private void KeyboardLayoutButton_Click(object sender, RoutedEventArgs e)
-        {
             if(this.CurrentlyEditingStandardKey != null)
             {
                 this.CurrentlyEditingStandardKey.Visibility = Visibility.Visible;
+                this.CurrentlyEditingStandardKey = null;
             }
 
             Button button = (Button)sender;
-            this.CurrentlyEditingStandardKey = button;
+
+
+            bool fn_mode = button.Name.StartsWith("keyboardFNLayoutButton");
+
+            if(fn_mode)
+            {
+                this.CurrentlyEditingFnKey = button;
+            }
+            else
+            {
+                this.CurrentlyEditingStandardKey = button;
+            }
 
             // Switch parents
-            RelativePanel selector_parent = (RelativePanel)keyboardStandardLayout.Parent;
-            selector_parent.Children.Remove(keyboardStandardLayout);
+            RelativePanel selector_parent = (RelativePanel)keyboardLayoutSelection.Parent;
+            selector_parent.Children.Remove(keyboardLayoutSelection);
 
             RelativePanel parent = (RelativePanel)button.Parent;
-            parent.Children.Add(keyboardStandardLayout);
+            parent.Children.Add(keyboardLayoutSelection);
             
-            keyboardStandardLayout.Margin = button.Margin;
-            keyboardStandardLayout.Width = button.Width;
-            keyboardStandardLayout.SelectedIndex = this.KeyboardKeyLabels.IndexOf((string)button.Content);
+            keyboardLayoutSelection.Margin = button.Margin;
+            keyboardLayoutSelection.Width = button.Width;
+            keyboardLayoutSelection.SelectedIndex = this.KeyboardKeyLabels.IndexOf((string)button.Content);
             
             button.Visibility = Visibility.Collapsed;
-            keyboardStandardLayout.Visibility = Visibility.Visible;
+            keyboardLayoutSelection.Visibility = Visibility.Visible;
+
+            await Task.Delay(1);
             
-            keyboardStandardLayout.IsDropDownOpen = true;
+            keyboardLayoutSelection.IsDropDownOpen = true;
         }
 
         private void KeyboardStandardLayout_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            string label = keyboardStandardLayout.SelectedItem as string; ;
-            this.CurrentlyEditingStandardKey.Content = label;
-            this.CurrentlyEditingStandardKey.Visibility = Visibility.Visible;
+            string label = keyboardLayoutSelection.SelectedItem as string;
+
+            if(String.IsNullOrEmpty(label))
+            {
+                label = KeyboardKey.IntKeyboardKeys[0].KeyShortLabel;
+            }
+
+            Button button = (this.CurrentlyEditingStandardKey != null) ? this.CurrentlyEditingStandardKey : this.CurrentlyEditingFnKey;
+            int length = (this.CurrentlyEditingStandardKey != null) ? 28 : 22; // special constants 
 
             int index = -1;
 
             try
             {
-                Int32.TryParse(this.CurrentlyEditingStandardKey.Name.Substring(28), out index);
+                Int32.TryParse(button.Name.Substring(length), out index);
             }
             catch
             {
@@ -528,7 +570,22 @@ private void KeyboardStandardLayout_SelectionChanged(object sender, SelectionCha
             if(index >= 0)
             {
                 string full_label = this.KeyboardKeyLabelTranslation[label];
-                this.EditingProfile.NormalKeys[index] = KeyboardKey.StringKeyboardKeys[full_label];
+
+                if(this.CurrentlyEditingFnKey != null)
+                {
+                    this.EditingProfile.FnKeys[index] = KeyboardKey.StringKeyboardKeys[full_label];
+
+
+                    this.CurrentlyEditingFnKey.Content = label;
+                    this.CurrentlyEditingFnKey.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    this.EditingProfile.NormalKeys[index] = KeyboardKey.StringKeyboardKeys[full_label];
+
+                    this.CurrentlyEditingStandardKey.Content = label;
+                    this.CurrentlyEditingStandardKey.Visibility = Visibility.Visible;
+                }
             }
 
             this.SaveProfiles();
@@ -536,8 +593,18 @@ private void KeyboardStandardLayout_SelectionChanged(object sender, SelectionCha
 
         private void KeyboardStandardLayout_DropDownClosed(object sender, object e)
         {
-            this.CurrentlyEditingStandardKey.Visibility = Visibility.Visible;
-            this.keyboardStandardLayout.Visibility = Visibility.Collapsed;
+
+            if (this.CurrentlyEditingFnKey != null)
+            {
+                this.CurrentlyEditingFnKey.Visibility = Visibility.Visible;
+            }
+
+            if (this.CurrentlyEditingStandardKey != null)
+            {
+                this.CurrentlyEditingStandardKey.Visibility = Visibility.Visible;
+            }
+
+            this.keyboardLayoutSelection.Visibility = Visibility.Collapsed;
         }
     }
 }