diff --git a/src/Artemis.UI.Avalonia/Screens/Debugger/DebugView.axaml b/src/Artemis.UI.Avalonia/Screens/Debugger/DebugView.axaml
index 7867c29a0..1f90a6a68 100644
--- a/src/Artemis.UI.Avalonia/Screens/Debugger/DebugView.axaml
+++ b/src/Artemis.UI.Avalonia/Screens/Debugger/DebugView.axaml
@@ -2,6 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
         mc:Ignorable="d" d:DesignWidth="1200" d:DesignHeight="800"
         x:Class="Artemis.UI.Avalonia.Screens.Debugger.DebugView"
         Title="Artemis | Debugger"
@@ -9,18 +10,9 @@
         Height="800"
         ExtendClientAreaToDecorationsHint="True">
 
-    <Grid RowDefinitions="Auto,*" ColumnDefinitions="Auto,*">
-        <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}, Path=Title}"
-                   IsHitTestVisible="False"
-                   Margin="10" />
-
-        <Border Grid.Row="1" Grid.Column="0">
-            <TextBlock>Test</TextBlock>
-        </Border>
-
-        <Border Grid.Row="1" Grid.Column="1">
-            <TextBlock>Test</TextBlock>
-        </Border>
-    </Grid>
+	<controls:NavigationView x:Name="Navigation">
+        
+    </controls:NavigationView>
+   
 
 </Window>
\ No newline at end of file
diff --git a/src/Artemis.UI.Avalonia/Screens/Device/Views/DeviceSettingsView.axaml b/src/Artemis.UI.Avalonia/Screens/Device/Views/DeviceSettingsView.axaml
index 338de63ce..b1b8e5ae1 100644
--- a/src/Artemis.UI.Avalonia/Screens/Device/Views/DeviceSettingsView.axaml
+++ b/src/Artemis.UI.Avalonia/Screens/Device/Views/DeviceSettingsView.axaml
@@ -49,7 +49,7 @@
             <Grid Grid.Row="2" Margin="10" ColumnDefinitions="25,*">
                 <CheckBox IsChecked="{Binding IsDeviceEnabled}" />
 
-				<controls:SplitButton Grid.Column="1" Content="Properties" Command="{Binding OpenSettings}" HorizontalAlignment="Right">
+				<controls:SplitButton Grid.Column="1" Content="Properties" Command="{Binding ViewProperties}" HorizontalAlignment="Right">
 					<controls:SplitButton.Flyout>
 						<MenuFlyout Placement="Bottom">
 							<MenuItem Header="Open plugin directory" Command="{Binding OpenPluginDirectory}">