diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
index 01108895d..c0621a2d9 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
@@ -1,58 +1,70 @@
-<UserControl x:Class="Flow.Launcher.Plugin.Caculator.Views.CalculatorSettings"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:ui="clr-namespace:Flow.Launcher.Infrastructure.UI;assembly=Flow.Launcher.Infrastructure"
-             xmlns:calculator="clr-namespace:Flow.Launcher.Plugin.Caculator"
-             xmlns:core="clr-namespace:Flow.Launcher.Core;assembly=Flow.Launcher.Core"
-             xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Caculator.ViewModels"
-             mc:Ignorable="d"
-             Loaded="CalculatorSettings_Loaded"
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="Flow.Launcher.Plugin.Caculator.Views.CalculatorSettings"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:calculator="clr-namespace:Flow.Launcher.Plugin.Caculator"
+    xmlns:core="clr-namespace:Flow.Launcher.Core;assembly=Flow.Launcher.Core"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="clr-namespace:Flow.Launcher.Infrastructure.UI;assembly=Flow.Launcher.Infrastructure"
+    xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Caculator.ViewModels"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    Loaded="CalculatorSettings_Loaded"
+    mc:Ignorable="d">
 
     <UserControl.Resources>
-        <core:LocalizationConverter x:Key="LocalizationConverter"/>
+        <core:LocalizationConverter x:Key="LocalizationConverter" />
     </UserControl.Resources>
 
-    <Grid Margin="20 14 0 14">
+    <Grid Margin="70,14,0,14">
         <Grid.RowDefinitions>
-            <RowDefinition Height="auto"/>
-            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="3*" />
         </Grid.ColumnDefinitions>
 
-        <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource flowlauncher_plugin_calculator_output_decimal_seperator}" 
-                   VerticalAlignment="Center" FontSize="14"/>
-        <ComboBox x:Name="DecimalSeparatorComboBox"
-                      Grid.Column="1"
-                      Grid.Row="0"
-                      Margin="10 5 0 5"
-                      HorizontalAlignment="Left"
-                      MaxWidth="300"
-                      SelectedItem="{Binding Settings.DecimalSeparator}"
-                      ItemsSource="{Binding Source={ui:EnumBindingSource {x:Type calculator:DecimalSeparator}}}">
+        <TextBlock
+            Grid.Row="0"
+            Grid.Column="0"
+            Margin="0,0,10,0"
+            VerticalAlignment="Center"
+            FontSize="14"
+            Text="{DynamicResource flowlauncher_plugin_calculator_output_decimal_seperator}" />
+        <ComboBox
+            x:Name="DecimalSeparatorComboBox"
+            Grid.Row="0"
+            Grid.Column="1"
+            MaxWidth="300"
+            Margin="10,5,0,5"
+            HorizontalAlignment="Left"
+            ItemsSource="{Binding Source={ui:EnumBindingSource {x:Type calculator:DecimalSeparator}}}"
+            SelectedItem="{Binding Settings.DecimalSeparator}">
             <ComboBox.ItemTemplate>
                 <DataTemplate>
-                    <TextBlock Text="{Binding Converter={StaticResource LocalizationConverter}}" FontSize="14"/>
+                    <TextBlock FontSize="14" Text="{Binding Converter={StaticResource LocalizationConverter}}" />
                 </DataTemplate>
             </ComboBox.ItemTemplate>
         </ComboBox>
 
-        <TextBlock Grid.Column="0" Grid.Row="1" Text="{DynamicResource flowlauncher_plugin_calculator_max_decimal_places}" 
-                   VerticalAlignment="Center" FontSize="14"/>
-        <ComboBox x:Name="MaxDecimalPlaces"
-                      Grid.Column="1"
-                      Grid.Row="1"
-                      Margin="10 5 0 5"
-                      HorizontalAlignment="Left"
-                      MaxWidth="300"
-                      SelectedItem="{Binding Settings.MaxDecimalPlaces}"
-                      ItemsSource="{Binding MaxDecimalPlacesRange}">
-        </ComboBox>
+        <TextBlock
+            Grid.Row="1"
+            Grid.Column="0"
+            Margin="0,0,10,0"
+            VerticalAlignment="Center"
+            FontSize="14"
+            Text="{DynamicResource flowlauncher_plugin_calculator_max_decimal_places}" />
+        <ComboBox
+            x:Name="MaxDecimalPlaces"
+            Grid.Row="1"
+            Grid.Column="1"
+            Margin="10,5,0,5"
+            HorizontalAlignment="Left"
+            ItemsSource="{Binding MaxDecimalPlacesRange}"
+            SelectedItem="{Binding Settings.MaxDecimalPlaces}" />
 
     </Grid>
 </UserControl>