diff --git a/CodeMonitor/CodeMonitor.csproj b/CodeMonitor/CodeMonitor.csproj
index 1f230cd..50a25f1 100644
--- a/CodeMonitor/CodeMonitor.csproj
+++ b/CodeMonitor/CodeMonitor.csproj
@@ -1,8 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Update="**\*.xaml.cs">
       <DependentUpon>%(Filename)</DependentUpon>
diff --git a/CodeMonitor/Models/CleanupCodeFile.cs b/CodeMonitor/Models/CleanupCodeFile.cs
index e6cbc0f..6b65dc9 100644
--- a/CodeMonitor/Models/CleanupCodeFile.cs
+++ b/CodeMonitor/Models/CleanupCodeFile.cs
@@ -1,4 +1,4 @@
-namespace CodeMonitor
+namespace CodeMonitor.Models
 {
     public class CleanupCodeFile
     {
@@ -7,6 +7,6 @@ public CleanupCodeFile(string path)
             Path = path;
         }
 
-        public string Path {get;}
+        public string Path { get; }
     }
 }
diff --git a/CodeMonitor/Models/CleanupCodeWatcher.cs b/CodeMonitor/Models/CleanupCodeWatcher.cs
index 65e5b01..1957dc5 100644
--- a/CodeMonitor/Models/CleanupCodeWatcher.cs
+++ b/CodeMonitor/Models/CleanupCodeWatcher.cs
@@ -1,16 +1,14 @@
 using System;
 using System.Linq;
-using System.Xml.Linq;
 using System.Collections.Generic;
 using System.IO;
 using System.Diagnostics;
 using System.Text;
 using System.Reactive.Subjects;
 using System.Reactive.Linq;
-using System.Reactive.Concurrency;
 using DynamicData;
-
-namespace CodeMonitor
+
+namespace CodeMonitor.Models
 {
     public class CleanupCodeWatcher
     {
@@ -57,8 +55,11 @@ private bool ShouldHandle(string s)
                 s.EndsWith("~") ||
                 s.EndsWith(".csproj") ||
                 s.EndsWith(".TMP")
-            ) return false;
-
+            )
+            {
+                return false;
+            }
+
             if (Directory.Exists(s))
             {
                 return false;
@@ -76,9 +77,7 @@ private bool ShouldHandle(string s)
             var result = proc.StandardOutput.ReadToEnd();
             proc.WaitForExit();
 
-            if (result != "") return false;
-
-            return true;
+            return result?.Length == 0;
         }
 
         public void ResetChanged()
@@ -112,7 +111,7 @@ public void CleanupFiles()
         {
             var psi = new ProcessStartInfo
             {
-                FileName = @"c:\bin\cleanupcode.exe",
+                FileName = $@"{Settings.RsCltPath}\cleanupcode.exe",
                 CreateNoWindow = true,
                 RedirectStandardOutput = true,
                 RedirectStandardError = true,
@@ -150,7 +149,7 @@ public void CleanupFiles()
                 throw new Exception("CleanupCode was sad");
             }
 
-            lock(_mutex)
+            lock (_mutex)
             {
                 _changed.Clear();
                 results.Clear();
@@ -182,6 +181,5 @@ public void Start()
 
             ResetChanged();
         }
-
     }
 }
diff --git a/CodeMonitor/Models/InspectCodeLoop.cs b/CodeMonitor/Models/InspectCodeLoop.cs
index 4597474..65a2885 100644
--- a/CodeMonitor/Models/InspectCodeLoop.cs
+++ b/CodeMonitor/Models/InspectCodeLoop.cs
@@ -9,8 +9,8 @@
 using System.Reactive.Linq;
 using System.Reactive.Concurrency;
 using DynamicData;
-
-namespace CodeMonitor
+
+namespace CodeMonitor.Models
 {
     public class InspectCodeLoop
     {
@@ -54,8 +54,11 @@ private bool ShouldHandle(string s)
                 s.EndsWith("~") ||
                 s.EndsWith(".csproj") ||
                 s.EndsWith(".TMP")
-            ) return false;
-
+            )
+            {
+                return false;
+            }
+
             if (Directory.Exists(s))
             {
                 return false;
@@ -73,9 +76,7 @@ private bool ShouldHandle(string s)
             var result = proc.StandardOutput.ReadToEnd();
             proc.WaitForExit();
 
-            if (result != "") return false;
-
-            return true;
+            return result?.Length == 0;
         }
 
         private void ExamineFiles(ICollection<string> filePaths)
@@ -84,7 +85,7 @@ private void ExamineFiles(ICollection<string> filePaths)
 
             var psi = new ProcessStartInfo
             {
-                FileName = @"c:\bin\inspectcode.exe",
+                FileName = $@"{Settings.RsCltPath}\inspectcode.exe",
                 CreateNoWindow = true,
                 RedirectStandardOutput = true
             };
@@ -104,7 +105,7 @@ private void ExamineFiles(ICollection<string> filePaths)
             }
 
             //TODO: Use a config file
-            if(filePaths.Count < 100)
+            if (filePaths.Count < 100)
             {
                 args.AddRange(filePaths.Select(x => $"--input={x}"));
             }
@@ -114,7 +115,7 @@ private void ExamineFiles(ICollection<string> filePaths)
             args.ForEach(psi.ArgumentList.Add);
 
             var proc = Process.Start(psi);
-            proc.OutputDataReceived += (o,e) => status.OnNext(e.Data);
+            proc.OutputDataReceived += (o, e) => status.OnNext(e.Data);
             proc.BeginOutputReadLine();
             proc.WaitForExit();
             var xml = File.ReadAllText(outFile);
@@ -123,7 +124,7 @@ private void ExamineFiles(ICollection<string> filePaths)
 
             var problems = doc.Root.Element("Issues")
                                    .Elements("Project")
-                                   .Elements((XName)"Issue")
+                                   .Elements("Issue")
                                    .Select(x =>
                                    (
                                        File: x.Attribute("File").Value,
@@ -145,7 +146,7 @@ private void ExamineFiles(ICollection<string> filePaths)
             }
         }
 
-        IDisposable subscription;
+        private IDisposable subscription;
 
         internal void Stop()
         {
@@ -197,25 +198,24 @@ private void Loop(long _)
                                     .Select(x => x.key)
                                     .ToList();
 
-                if (gone.Any() || _changed.Any())
+                if (gone.Count > 0 || _changed.Count > 0)
                 {
                     var changeNote = new StringBuilder();
 
                     changeNote.AppendLine();
                     changeNote.AppendLine("Changes detected!");
-                    if (gone.Any())
+                    if (gone.Count > 0)
                     {
                         changeNote.AppendLine("Gone: ");
                         changeNote.AppendLine(string.Join(Environment.NewLine, gone));
                     }
-                    if (_changed.Any())
+                    if (_changed.Count > 0)
                     {
                         changeNote.AppendLine("Changed: ");
                         changeNote.AppendLine(string.Join(Environment.NewLine, _changed));
                     }
                     changeNote.AppendLine("Analyzing...");
 
-
                     foreach (var g in gone)
                     {
                         results.Remove(g);
@@ -230,7 +230,6 @@ private void Loop(long _)
                     }
                     finally
                     {
-
                         status.OnNext("Idle");
                         active.OnNext(false);
                     }
diff --git a/CodeMonitor/Models/InspectCodeProblem.cs b/CodeMonitor/Models/InspectCodeProblem.cs
index d2ddd25..fab5012 100644
--- a/CodeMonitor/Models/InspectCodeProblem.cs
+++ b/CodeMonitor/Models/InspectCodeProblem.cs
@@ -1,4 +1,4 @@
-namespace CodeMonitor
+namespace CodeMonitor.Models
 {
     public class InspectCodeProblem
     {
diff --git a/CodeMonitor/Models/InspectCodeResult.cs b/CodeMonitor/Models/InspectCodeResult.cs
index 88684a1..42980bd 100644
--- a/CodeMonitor/Models/InspectCodeResult.cs
+++ b/CodeMonitor/Models/InspectCodeResult.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace CodeMonitor
+namespace CodeMonitor.Models
 {
     public class InspectCodeFileProblems
     {
diff --git a/CodeMonitor/Program.cs b/CodeMonitor/Program.cs
index f496777..de517bb 100644
--- a/CodeMonitor/Program.cs
+++ b/CodeMonitor/Program.cs
@@ -1,21 +1,30 @@
 using Avalonia;
 using Avalonia.Logging.Serilog;
 using Avalonia.ReactiveUI;
-
+using System;
+using System.IO;
+
 namespace CodeMonitor
 {
-    class Program
+    public static class Program
     {
         // Initialization code. Don't use any Avalonia, third-party APIs or any
         // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
         // yet and stuff might break.
         public static void Main(string[] args)
         {
+            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+
             BuildAvaloniaApp()
             .StartWithClassicDesktopLifetime(args);
-        }
-
-        // Avalonia configuration, don't remove; also used by visual designer.
+        }
+
+        private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
+            File.WriteAllText("Error-" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".trace",  (e.ExceptionObject as Exception)?.ToString());
+        }
+
+        // Avalonia configuration, don't remove; also used by visual designer.
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
diff --git a/CodeMonitor/ViewModels/FileToCleanViewModel.cs b/CodeMonitor/ViewModels/FileToCleanViewModel.cs
index da1e646..1b6ad28 100644
--- a/CodeMonitor/ViewModels/FileToCleanViewModel.cs
+++ b/CodeMonitor/ViewModels/FileToCleanViewModel.cs
@@ -1,16 +1,4 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Dynamic;
-using System.IO;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Linq;
-using DynamicData;
-using ReactiveUI;
-using SharpDX.Direct2D1;
-
-#warning subscriptions need disposing
-namespace CodeMonitor.ViewModels
+namespace CodeMonitor.ViewModels
 {
     public class FileToCleanViewModel
     {
diff --git a/CodeMonitor/ViewModels/MainWindowViewModel.cs b/CodeMonitor/ViewModels/MainWindowViewModel.cs
index ddee4c0..82bb46e 100644
--- a/CodeMonitor/ViewModels/MainWindowViewModel.cs
+++ b/CodeMonitor/ViewModels/MainWindowViewModel.cs
@@ -1,16 +1,15 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Dynamic;
 using System.IO;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
 using Avalonia.Controls;
+using CodeMonitor.Models;
 using DynamicData;
 using PropertyChanged;
 using ReactiveUI;
 
-#warning subscriptions need disposing
 namespace CodeMonitor.ViewModels
 {
     [AddINotifyPropertyChangedInterface]
@@ -19,9 +18,11 @@ public class MainWindowViewModel : ViewModelBase
         public ReactiveCommand<Window,Unit> Add { get; }
 
         public ReadOnlyObservableCollection<MonitoredDirectoryViewModel> Monitored => monitored;
-        private ReadOnlyObservableCollection<MonitoredDirectoryViewModel> monitored;
+        private readonly ReadOnlyObservableCollection<MonitoredDirectoryViewModel> monitored;
 
-        private SourceCache<MonitoredDirectoryViewModel, string> monitoredSourceCache;
+        private readonly SourceCache<MonitoredDirectoryViewModel, string> monitoredSourceCache;
+
+        public ReactiveCommand<Window, Unit> SetResharperCliPath {get; }
 
         public MainWindowViewModel()
         {
@@ -30,13 +31,14 @@ public MainWindowViewModel()
             monitoredSourceCache.Connect()
                                 .ObserveOn(RxApp.MainThreadScheduler)
                                 .Bind(out monitored)
+                                .DisposeMany()
                                 .Subscribe();
 
-            Add = ReactiveCommand.CreateFromTask<Window,Unit>(async w =>
+            Add = ReactiveCommand.CreateFromTask<Window>(async w =>
             {
                 var d = new OpenFolderDialog();
 
-                var result = await d.ShowAsync(w);
+                var result = await d.ShowAsync(w).ConfigureAwait(false);
 
                 if (Directory.Exists(result))
                 {
@@ -47,7 +49,13 @@ public MainWindowViewModel()
 
                     monitoredSourceCache.AddOrUpdate(new MonitoredDirectoryViewModel(result));
                 }
-                return Unit.Default;
+            });
+
+            SetResharperCliPath = ReactiveCommand.Create<Window>(async w =>
+            {
+                var d = new OpenFolderDialog ();
+
+                Settings.RsCltPath = await d.ShowAsync(w).ConfigureAwait(false);
             });
         }
     }
diff --git a/CodeMonitor/ViewModels/MonitoredDirectoryViewModel.cs b/CodeMonitor/ViewModels/MonitoredDirectoryViewModel.cs
index ffd5f44..da378eb 100644
--- a/CodeMonitor/ViewModels/MonitoredDirectoryViewModel.cs
+++ b/CodeMonitor/ViewModels/MonitoredDirectoryViewModel.cs
@@ -1,37 +1,34 @@
 using System;
 using System.Collections.ObjectModel;
-using System.Dynamic;
 using System.IO;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
+using CodeMonitor.Models;
 using DynamicData;
 using ReactiveUI;
-using SharpDX.Direct2D1;
 
-#warning subscriptions need disposing
 namespace CodeMonitor.ViewModels
 {
     public class MonitoredDirectoryViewModel : ViewModelBase
     {
         public string Name { get; }
 
-        private ObservableAsPropertyHelper<bool> updating;
+        private readonly ObservableAsPropertyHelper<bool> updating;
         public bool Updating => updating.Value;
 
-        private ObservableAsPropertyHelper<string> status;
+        private readonly ObservableAsPropertyHelper<string> status;
         public string Status => status?.Value;
 
         public ReadOnlyObservableCollection<ProblemGroupViewModel> ProblemGroups => problemGroups;
-        private ReadOnlyObservableCollection<ProblemGroupViewModel> problemGroups;
+        private readonly ReadOnlyObservableCollection<ProblemGroupViewModel> problemGroups;
 
         public ReadOnlyObservableCollection<FileToCleanViewModel> FilesToClean => filesToClean;
-        private ReadOnlyObservableCollection<FileToCleanViewModel> filesToClean;
+        private readonly ReadOnlyObservableCollection<FileToCleanViewModel> filesToClean;
 
-        private InspectCodeLoop _inspectLoop;
-        private CleanupCodeWatcher _cleanupWatcher;
-
+        private readonly InspectCodeLoop _inspectLoop;
+        private readonly CleanupCodeWatcher _cleanupWatcher;
 
         public ReactiveCommand<Unit, Unit> CleanFiles { get; }
         public ReactiveCommand<Unit, Unit> ResetCleanFiles { get; }
@@ -66,8 +63,8 @@ public MonitoredDirectoryViewModel(string directory)
                                .DisposeMany()
                                .Subscribe();
 
-                status = _inspectLoop.Status.Concat(_cleanupWatcher.Status).ToProperty(this, x => x.Status);
-                updating = _inspectLoop.Active.Concat(_cleanupWatcher.Active).ToProperty(this, x => x.Updating);
+                status = _inspectLoop.Status.Merge(_cleanupWatcher.Status).ToProperty(this, x => x.Status);
+                updating = _inspectLoop.Active.Merge(_cleanupWatcher.Active).ToProperty(this, x => x.Updating);
 
                 CleanFiles = ReactiveCommand.CreateFromTask(() => Task.Run(() => _cleanupWatcher.CleanupFiles()));
 
diff --git a/CodeMonitor/ViewModels/ProblemGroupViewModel.cs b/CodeMonitor/ViewModels/ProblemGroupViewModel.cs
index ea18aef..a0636e1 100644
--- a/CodeMonitor/ViewModels/ProblemGroupViewModel.cs
+++ b/CodeMonitor/ViewModels/ProblemGroupViewModel.cs
@@ -1,24 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Dynamic;
-using System.IO;
-using System.Linq;
-using System.Reactive;
-using System.Reactive.Linq;
-using DynamicData;
-using ReactiveUI;
+using System.Collections.Generic;
+using CodeMonitor.Models;
 
 namespace CodeMonitor.ViewModels
 {
-#warning subscriptions need disposing
-
     public class ProblemGroupViewModel : ViewModelBase
     {
         public ProblemGroupViewModel(InspectCodeFileProblems model)
         {
             Group = model.File;
-            Problems = model.Problems.Select(y => new ProblemViewModel(model.File, y.Message, y.Line, y.Type)).ToList();
+            Problems = model.Problems.ConvertAll(y => new ProblemViewModel(model.File, y.Message, y.Line, y.Type));
         }
 
         public string Group { get; }
diff --git a/CodeMonitor/ViewModels/ProblemViewModel.cs b/CodeMonitor/ViewModels/ProblemViewModel.cs
index 2ea666d..d8f50e2 100644
--- a/CodeMonitor/ViewModels/ProblemViewModel.cs
+++ b/CodeMonitor/ViewModels/ProblemViewModel.cs
@@ -2,7 +2,6 @@
 
 namespace CodeMonitor.ViewModels
 {
-
     public class ProblemViewModel : ViewModelBase
     {
         public ProblemViewModel(string file, string message, int line, string type)
diff --git a/CodeMonitor/Views/MainWindow.xaml b/CodeMonitor/Views/MainWindow.xaml
index 02c85c6..be33def 100644
--- a/CodeMonitor/Views/MainWindow.xaml
+++ b/CodeMonitor/Views/MainWindow.xaml
@@ -4,8 +4,9 @@
         xmlns:l="clr-namespace:CodeMonitor.Views;assembly=CodeMonitor"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        Width="700" Height="300"
-        mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="300"
+        xmlns:s="clr-namespace:System;assembly=mscorlib"
+        Width="900" Height="300"
+        mc:Ignorable="d" d:DesignWidth="900" d:DesignHeight="300"
         HasSystemDecorations="False"
         x:Name="mw"
         Topmost="True"
@@ -47,14 +48,14 @@
     </Style>
     <Style Selector="TabItem">
       <Setter Property="FontSize" Value="12"/>
-      <Setter Property="Padding" Value="6,2"/>
+      <Setter Property="Padding" Value="6,4"/>
       <Setter Property="Background" Value="Transparent"/>
     </Style>
     <Style Selector="TabItem:selected">
-      <Setter Property="Background" Value="{DynamicResource tone1}"/>
+      <Setter Property="Background" Value="{DynamicResource tone2}"/>
     </Style>
     <Style Selector="TabItem:pointerover">
-      <Setter Property="Background" Value="{DynamicResource tone2}"/>
+      <Setter Property="Background" Value="{DynamicResource tone1}"/>
     </Style>
     <Style Selector="TabItem:pressed">
       <Setter Property="Background" Value="{DynamicResource bd}"/>
@@ -86,7 +87,7 @@
     </Style>
   </Window.Styles>
   <Design.DataContext>
-    <l:dvm/>
+    <l:TestMainVM/>
   </Design.DataContext>
   <Grid RowDefinitions="auto,*,auto, auto" ColumnDefinitions="90, 0, *" x:Name="mg" Background="{StaticResource tone1}">
     <Grid Grid.ColumnSpan="3" Height="24" x:Name="moveThumb" Background="Transparent">
@@ -133,14 +134,14 @@
         </DataTemplate>
       </ListBox.ItemTemplate>
     </ListBox>
-    <Button Classes="ib" Grid.Row="1" VerticalAlignment="Bottom" HorizontalAlignment="Right" Command="{Binding Add}" CommandParameter="{Binding #mw}" Margin="0,0,3,5">
+    <Button Classes="ib" Grid.Row="1" VerticalAlignment="Bottom" HorizontalAlignment="Right" Command="{Binding Add}" CommandParameter="{Binding #mw}" Margin="0,0,3,5" Cursor="Hand">
       <StackPanel Orientation="Horizontal">
         <TextBlock Foreground="{StaticResource bd}" Margin="0,-2,3,0" VerticalAlignment="Center">monitor</TextBlock>
         <Image Source="/Assets/addIcon.png" Height="16" Width="16" VerticalAlignment="Center"/>
       </StackPanel>
     </Button>
     <Border Background="{StaticResource tone3}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.Column="2" Grid.Row="1" CornerRadius="7,0,0,0">
-      <TabControl DataContext="{Binding #monitorList.SelectedItem}" Margin="0,0,0,11">
+      <TabControl DataContext="{Binding #monitorList.SelectedItem}" Margin="0,0,0,12">
         <TabItem Header="InspectCode.exe">
       <ItemsControl Items="{Binding ProblemGroups}">
         <ItemsControl.ItemTemplate>
@@ -173,7 +174,7 @@
       </ItemsControl>
           </TabItem>
           <TabItem Header="CleanupCode.exe">
-            <Grid ColumnDefinitions="*,50">
+            <Grid>
               
             <ListBox Items="{Binding FilesToClean}" Background="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Padding="0" Margin="0" BorderThickness="0">
               <ListBox.Styles>
@@ -194,7 +195,7 @@
                 </DataTemplate>
               </ListBox.ItemTemplate>
             </ListBox>
-              <StackPanel Orientation="Vertical" Grid.Column="1" Spacing="5" Margin="3,0" VerticalAlignment="Bottom">
+              <StackPanel Orientation="Vertical" Grid.Column="1" Spacing="5" Margin="3,0,23,7" VerticalAlignment="Bottom" HorizontalAlignment="Right">
                 <Button Background="{StaticResource tone2}" Command="{Binding CleanFiles}">Clean</Button>
                 <Button Background="{StaticResource tone2}" Command="{Binding ResetCleanFiles}">Reset</Button>
               </StackPanel>
@@ -203,9 +204,33 @@
       </TabControl>
     </Border>
     <GridSplitter Classes="f" Grid.Column="1" Grid.Row="1" Width="3" Background="Transparent" VerticalAlignment="Stretch" Margin="0,0,-3,0"/>
-    <Border HorizontalAlignment="Stretch" Background="{StaticResource tone2}" VerticalAlignment="Bottom" Height="17" Grid.Row="1" Grid.Column="2" BorderThickness="0,1,0,0" BorderBrush="{StaticResource bd}">
-      <TextBlock HorizontalAlignment="Right" Text="{Binding #monitorList.SelectedItem.Status}" Margin="0,0,19,1"/>
+    <Border HorizontalAlignment="Stretch" Background="{StaticResource tone2}" VerticalAlignment="Bottom" Height="25" Grid.Row="1" Grid.Column="2" >
+      <TextBlock HorizontalAlignment="Right" Text="{Binding #monitorList.SelectedItem.Status}" Margin="0,0,24,0" VerticalAlignment="Center"/>
     </Border>
-    <Border HorizontalAlignment="Right" VerticalAlignment="Bottom" x:Name="sizeThumb" Width="16" Height="16" Grid.Row="1" Grid.Column="2" Background="{StaticResource tone3}" Cursor="BottomRightCorner"/>
+    <Border HorizontalAlignment="Right" VerticalAlignment="Bottom" x:Name="sizeThumb" Width="24" Height="24" Grid.Row="1" Grid.Column="2" Cursor="BottomRightCorner">
+      <Polygon Fill="{StaticResource tone3}" Points="12,24 24,24 24,12 12,24"/>
+    </Border>
+    <Button Classes="ib" HorizontalAlignment="Right" VerticalAlignment="Top"  Grid.Row="1" Grid.Column="2" Cursor="Hand" Command="{Binding SetResharperCliPath}" CommandParameter="{Binding #mw}">
+      <StackPanel Orientation="Horizontal">
+        <TextBlock Foreground="{StaticResource bd}" VerticalAlignment="Center">resharper cli path</TextBlock>
+      <Canvas Margin="0,3,0,0" Width="24" Height="17">
+        <Canvas.Resources>
+          <s:Double x:Key="wid">2</s:Double>
+          <s:Double x:Key="hig">16</s:Double>
+          <s:Double x:Key="ofs">12</s:Double>
+        </Canvas.Resources>
+        <Rectangle Canvas.Left="{StaticResource ofs}" Fill="{StaticResource bd}" Width="{StaticResource wid}" Height="{StaticResource hig}"> <Rectangle.RenderTransform> <RotateTransform Angle="00"/> </Rectangle.RenderTransform> </Rectangle>
+        <Rectangle Canvas.Left="{StaticResource ofs}" Fill="{StaticResource bd}" Width="{StaticResource wid}" Height="{StaticResource hig}"> <Rectangle.RenderTransform> <RotateTransform Angle="45"/> </Rectangle.RenderTransform> </Rectangle>
+        <Rectangle Canvas.Left="{StaticResource ofs}" Fill="{StaticResource bd}" Width="{StaticResource wid}" Height="{StaticResource hig}"> <Rectangle.RenderTransform> <RotateTransform Angle="90"/> </Rectangle.RenderTransform> </Rectangle>
+        <Rectangle Canvas.Left="{StaticResource ofs}" Fill="{StaticResource bd}" Width="{StaticResource wid}" Height="{StaticResource hig}"> <Rectangle.RenderTransform> <RotateTransform Angle="135"/> </Rectangle.RenderTransform> </Rectangle>
+        <Rectangle Canvas.Left="{StaticResource ofs}" Fill="{StaticResource bd}" Width="{StaticResource wid}" Height="{StaticResource hig}"> <Rectangle.RenderTransform> <RotateTransform Angle="180"/> </Rectangle.RenderTransform> </Rectangle>
+        <Rectangle Canvas.Left="{StaticResource ofs}" Fill="{StaticResource bd}" Width="{StaticResource wid}" Height="{StaticResource hig}"> <Rectangle.RenderTransform> <RotateTransform Angle="225"/> </Rectangle.RenderTransform> </Rectangle>
+        <Rectangle Canvas.Left="{StaticResource ofs}" Fill="{StaticResource bd}" Width="{StaticResource wid}" Height="{StaticResource hig}"> <Rectangle.RenderTransform> <RotateTransform Angle="270"/> </Rectangle.RenderTransform> </Rectangle>
+        <Rectangle Canvas.Left="{StaticResource ofs}" Fill="{StaticResource bd}" Width="{StaticResource wid}" Height="{StaticResource hig}"> <Rectangle.RenderTransform> <RotateTransform Angle="315"/> </Rectangle.RenderTransform> </Rectangle>
+        <Ellipse Fill="{StaticResource bd}" Width="10" Height="10" Canvas.Top="3" Canvas.Left="8"/>
+        <Ellipse Fill="{StaticResource tone3}" Width="6" Height="6" Canvas.Top="5" Canvas.Left="10"/>
+      </Canvas>
+        </StackPanel>
+    </Button>
   </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/CodeMonitor/Views/MainWindow.xaml.cs b/CodeMonitor/Views/MainWindow.xaml.cs
index b4dcff6..7093a2e 100644
--- a/CodeMonitor/Views/MainWindow.xaml.cs
+++ b/CodeMonitor/Views/MainWindow.xaml.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using System.Reactive;
 using System.Windows.Input;
 using Avalonia;
@@ -10,7 +9,7 @@
 
 namespace CodeMonitor.Views
 {
-    public class dmd
+    public class TestData
     {
         public string Name => "Test dir";
         public string Status => "Testing";
@@ -31,11 +30,11 @@ public class dmd
         public ReactiveCommand<Unit,Unit> ResetCleanFiles => ReactiveCommand.Create(delegate{ });
     }
 
-    public class dvm
+    public class TestMainVM
     {
-        public object Monitored => new dmd[]
+        public object Monitored => new TestData[]
         {
-            new dmd()
+            new TestData()
         };
     }