diff --git a/app/Desktop/App.axaml b/app/Desktop/App.axaml
index 38d95c5..059f61e 100644
--- a/app/Desktop/App.axaml
+++ b/app/Desktop/App.axaml
@@ -11,6 +11,7 @@
             <Setter Property="Background" Value="#D2D2D2" />
             <Setter Property="BorderBrush" Value="#999999" />
             <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CornerRadius" Value="0" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="VerticalContentAlignment" Value="Center" />
         </Style>
@@ -18,7 +19,6 @@
             <Setter Property="TextBlock.Foreground" Value="#070707" />
             <Setter Property="Background" Value="#D2D2D2" />
             <Setter Property="BorderBrush" Value="#999999" />
-            <Setter Property="CornerRadius" Value="0" />
         </Style>
         <Style Selector="Button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
             <Setter Property="Background" Value="#DEDEDE" />
@@ -37,20 +37,17 @@
             <Setter Property="TextBlock.Foreground" Value="#909090" />
             <Setter Property="Background" Value="#E9E9E9" />
             <Setter Property="BorderBrush" Value="#BFBFBF" />
-            <Setter Property="CornerRadius" Value="0" />
         </Style>
 
         <Style Selector="TextBox">
             <Setter Property="BorderBrush" Value="#999999" />
             <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CornerRadius" Value="0" />
             <Setter Property="SelectionBrush" Value="#72C0FF" />
             <Setter Property="Background" Value="#F4F4F4" />
             <Setter Property="Padding" Value="6 0" />
             <Setter Property="VerticalContentAlignment" Value="Center" />
         </Style>
-        <Style Selector="TextBox /template/ Border#PART_BorderElement">
-            <Setter Property="CornerRadius" Value="0" />
-        </Style>
         <Style Selector="TextBox:pointerover /template/ Border#PART_BorderElement">
             <Setter Property="BorderBrush" Value="#999999" />
             <Setter Property="Background" Value="#F8F8F8" />
@@ -68,6 +65,55 @@
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
 
+        <Style Selector="Expander">
+            <Setter Property="CornerRadius" Value="0" />
+        </Style>
+        <Style Selector="Expander /template/ ToggleButton#ExpanderHeader">
+            <Setter Property="HorizontalContentAlignment" Value="Left" />
+            <Setter Property="Template">
+                <ControlTemplate>
+                    <Border x:Name="ToggleButtonBackground">
+                        <Grid ColumnDefinitions="Auto,*" RowDefinitions="35">
+                            <Border x:Name="ExpandCollapseChevronBorder"
+                                    Grid.Column="0"
+                                    Width="35"
+                                    Height="35"
+                                    Margin="2,0"
+                                    RenderTransformOrigin="50%,50%">
+                                <Path x:Name="ExpandCollapseChevron"
+                                      HorizontalAlignment="Center"
+                                      VerticalAlignment="Center"
+                                      RenderTransformOrigin="50%,50%"
+                                      Stretch="None"
+                                      Stroke="{DynamicResource ExpanderChevronForeground}"
+                                      StrokeThickness="1" />
+                                <Border.RenderTransform>
+                                    <RotateTransform />
+                                </Border.RenderTransform>
+                            </Border>
+                            <ContentPresenter x:Name="PART_ContentPresenter"
+                                              Grid.Column="1"
+                                              Margin="0"
+                                              HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                              VerticalContentAlignment="Center"
+                                              Background="Transparent"
+                                              BorderBrush="Transparent"
+                                              BorderThickness="0"
+                                              Content="{TemplateBinding Content}"
+                                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                                              TextBlock.Foreground="{DynamicResource ExpanderForeground}" />
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter>
+        </Style>
+
     </Application.Styles>
 
+    <Application.Resources>
+        <Thickness x:Key="ExpanderHeaderPadding">15,0</Thickness>
+        <Thickness x:Key="ExpanderContentPadding">15</Thickness>
+        <SolidColorBrush x:Key="ExpanderDropDownBackground" Color="#FCFCFC" />
+    </Application.Resources>
+
 </Application>
diff --git a/app/Desktop/Desktop.csproj b/app/Desktop/Desktop.csproj
index 387573c..2efcfea 100644
--- a/app/Desktop/Desktop.csproj
+++ b/app/Desktop/Desktop.csproj
@@ -22,12 +22,12 @@
     <DebugType>none</DebugType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.3" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.3" />
+    <PackageReference Include="Avalonia" Version="0.10.10" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.10" />
     <ProjectReference Include="..\Server\Server.csproj" />
   </ItemGroup>
   <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.3" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.10" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Windows\MainWindow.axaml.cs">
diff --git a/app/Desktop/Main/Pages/TrackingPage.axaml b/app/Desktop/Main/Pages/TrackingPage.axaml
index e26d7d9..9bd910a 100644
--- a/app/Desktop/Main/Pages/TrackingPage.axaml
+++ b/app/Desktop/Main/Pages/TrackingPage.axaml
@@ -26,7 +26,7 @@
             <Button Command="{Binding OnClickToggleButton}" Content="{Binding ToggleButtonText}" IsEnabled="{Binding IsToggleButtonEnabled}" />
         </StackPanel>
         <Expander Header="Advanced Settings">
-            <StackPanel Spacing="10" Margin="0 10 0 0">
+            <StackPanel Spacing="10">
                 <TextBlock TextWrapping="Wrap">
                     The following settings determine how the tracking script communicates with this application. If you change them, you will have to copy and apply the tracking script again.
                 </TextBlock>
diff --git a/app/Desktop/Main/Pages/ViewerPage.axaml b/app/Desktop/Main/Pages/ViewerPage.axaml
index 9342461..b5d7c54 100644
--- a/app/Desktop/Main/Pages/ViewerPage.axaml
+++ b/app/Desktop/Main/Pages/ViewerPage.axaml
@@ -15,6 +15,7 @@
             <Setter Property="VerticalAlignment" Value="Center" />
         </Style>
         <Style Selector="Grid > CalendarDatePicker">
+            <Setter Property="CornerRadius" Value="0" />
             <Setter Property="HorizontalAlignment" Value="Stretch" />
             <Setter Property="HorizontalContentAlignment" Value="Center" />
             <Setter Property="VerticalAlignment" Value="Center" />