diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
index 2243907012f..9c1a79b7a5a 100644
--- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
+++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
@@ -723,18 +723,19 @@
                                         Header="{x:Static p:Resources.PackagePathsExpanderName}">
                                 <StackPanel Orientation="Vertical" Margin="0,6,0,0">
                                     <Label  Content="{x:Static p:Resources.PreferencesViewPackageDownloadDirectory}" 
-                                            Padding="0,5,5,5"
+                                            Padding="5,5,5,5"
                                             FontSize="13"
                                             Foreground="{StaticResource PreferencesWindowFontColor}"/>
                                     <ComboBox Grid.Row="1" 
                                               Width="Auto"
+                                              Margin="0,5,0,5"
                                               HorizontalAlignment="Left"
                                               ItemsSource="{Binding Path=PackagePathsForInstall}"
                                               SelectedItem="{Binding Path=SelectedPackagePathForInstall}"
                                               Style="{StaticResource NoBordersComboBoxStyle}"
                                               ToolTip="{Binding Path=SelectedPackagePathForInstall}">
                                     </ComboBox>
-                                    <ScrollViewer Height="250" VerticalScrollBarVisibility="Auto">
+                                    <ScrollViewer Height="200" VerticalScrollBarVisibility="Auto">
                                         <packagemanager:PackagePathView DataContext="{Binding PackagePathsViewModel}"/>
                                     </ScrollViewer>
                                 </StackPanel>
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackagePathView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackagePathView.xaml
index c2df5d3b3ff..752aa1640c4 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackagePathView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackagePathView.xaml
@@ -31,6 +31,7 @@
                     <Button
                          Grid.Column="0"
                         Margin="7,7,3,7"
+                         x:Name="MovePathUpButton"
                               Command="{Binding Path=DataContext.MovePathUpCommand,
           RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                          CommandParameter="{Binding}"
@@ -43,6 +44,7 @@
                     <Button
                          Grid.Column="1"
                          Margin="3,7,7,7"
+                         x:Name="MovePathDownButton"
                               Command="{Binding Path=DataContext.MovePathDownCommand,
           RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                          CommandParameter="{Binding}"
@@ -64,6 +66,7 @@
                     <Button
                          Grid.Column="3"
                          Margin="7,7,7,7"
+                         x:Name="UpdatePathButton"
                         Command="{Binding Path=DataContext.UpdatePathCommand,
           RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
                          CommandParameter="{Binding}"
@@ -73,7 +76,7 @@
                         <Image Source="/DynamoCoreWpf;component/UI/Images/PackageManager/folder_16_16.png" Width="15" Height="15"></Image>
                     </Button>
                     <!--the delete path button-->
-                    <Button
+                    <Button x:Name="DeletePathButton"
                         Grid.Column="4"
                         Margin="7,7,7,7"
                         Command="{Binding Path=DataContext.DeletePathCommand,