diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index 411767a1a69..8c8298fb8de 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -7188,7 +7188,7 @@ public static string PublishPackageViewLicenseWatermark {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Markdown Files Directory (optional).
+        ///   Looks up a localized string similar to Markdown Files Path (optional).
         /// </summary>
         public static string PublishPackageViewMarkdownFilesDirectory {
             get {
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index e25dd085103..f19fdeaa90e 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -2814,7 +2814,7 @@ This package will be unloaded after the next Dynamo restart.</value>
     <value>Add Directory And Its Files To Package</value>
   </data>
   <data name="PublishPackageViewMarkdownFilesDirectory" xml:space="preserve">
-    <value>Markdown Files Directory (optional)</value>
+    <value>Markdown Files Path (optional)</value>
   </data>
   <data name="PublishPackageViewMarkdownFilesDirectoryToolTip" xml:space="preserve">
     <value>An optional location for documenting your package in the markdown format.</value>
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index ff48fd18e72..de34b3f828b 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -1590,7 +1590,7 @@ If the toggle is off custom packages that are not already loaded will load once
     <value>Publish a {0} Package</value>
   </data>
   <data name="PublishPackageViewMarkdownFilesDirectory" xml:space="preserve">
-    <value>Markdown Files Directory (optional)</value>
+    <value>Markdown Files Path (optional)</value>
   </data>
   <data name="PublishPackageViewMarkdownFilesDirectoryToolTip" xml:space="preserve">
     <value>An optional location for documenting your package in the markdown format.</value>
diff --git a/src/DynamoCoreWpf/UI/Prompts/EditWindow.xaml b/src/DynamoCoreWpf/UI/Prompts/EditWindow.xaml
index bd569d13ace..e965030970b 100644
--- a/src/DynamoCoreWpf/UI/Prompts/EditWindow.xaml
+++ b/src/DynamoCoreWpf/UI/Prompts/EditWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="Dynamo.UI.Prompts.EditWindow"
+<Window x:Class="Dynamo.UI.Prompts.EditWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:ui="clr-namespace:Dynamo.UI"
@@ -7,7 +7,7 @@
         MaxHeight="{x:Static SystemParameters.PrimaryScreenHeight}"
         MaxWidth="{x:Static SystemParameters.PrimaryScreenWidth}"
         MinHeight="170" MinWidth="300"
-        Height="195" Width="400"
+        Height="250" Width="400"
         Style="{DynamicResource DynamoWindowStyle}"
         AllowsTransparency="True"
         WindowStyle="None">
diff --git a/src/DynamoCoreWpf/UI/Prompts/UsageReportingAgreementPrompt.xaml b/src/DynamoCoreWpf/UI/Prompts/UsageReportingAgreementPrompt.xaml
index df3caca7df6..54831264fdf 100644
--- a/src/DynamoCoreWpf/UI/Prompts/UsageReportingAgreementPrompt.xaml
+++ b/src/DynamoCoreWpf/UI/Prompts/UsageReportingAgreementPrompt.xaml
@@ -1,11 +1,12 @@
-<Window x:Class="Dynamo.UI.Prompts.UsageReportingAgreementPrompt"
+<Window x:Class="Dynamo.UI.Prompts.UsageReportingAgreementPrompt"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:ui="clr-namespace:Dynamo.UI"
         xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf"
         xmlns:views="clr-namespace:Dynamo.UI.Views"
         WindowStyle="None"
-        Width="530"
+        MinWidth="530"
+        MaxWidth="650"
         Height="605"
         ResizeMode="NoResize"
         ShowInTaskbar="False"
@@ -98,13 +99,13 @@
                     <RowDefinition Height="Auto"></RowDefinition>
                     <RowDefinition Height="220"></RowDefinition>
                     <RowDefinition Height="145"></RowDefinition>
-                    <RowDefinition Height="auto"></RowDefinition>
-                    <RowDefinition Height="auto"></RowDefinition>
+                    <RowDefinition Height="Auto"></RowDefinition>
+                    <RowDefinition Height="Auto"></RowDefinition>
                     <RowDefinition Height="50"></RowDefinition>
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"></ColumnDefinition>
-                    <ColumnDefinition Width="auto"></ColumnDefinition>
+                    <ColumnDefinition Width="Auto"></ColumnDefinition>
                 </Grid.ColumnDefinitions>
 
 
@@ -165,8 +166,8 @@
                         Margin="0 15 3 15" 
                         Padding="0">
                     <ScrollViewer 
-                        Margin="0 0 -18 0" 
-                              HorizontalScrollBarVisibility="Disabled" >
+                        Margin="0 0 -18 0"
+                        HorizontalScrollBarVisibility="Disabled" >
                         <views:RichTextFile x:Name="GoogleAnalyticsConsent"
                                         IsReadOnly="True"
                                         IsEnabled="True"
diff --git a/src/DynamoCoreWpf/Views/Core/ConnectorContextMenuView.xaml b/src/DynamoCoreWpf/Views/Core/ConnectorContextMenuView.xaml
index bd45a294c4d..b35fdcb4b2c 100644
--- a/src/DynamoCoreWpf/Views/Core/ConnectorContextMenuView.xaml
+++ b/src/DynamoCoreWpf/Views/Core/ConnectorContextMenuView.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Dynamo.Controls.ConnectorContextMenuView"
+<UserControl x:Class="Dynamo.Controls.ConnectorContextMenuView"
              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" 
@@ -23,7 +23,8 @@
             <ContextMenu Name="MainContextMenu"
                          Style="{StaticResource ContextMenuStyle}"
                          Background="#666666"
-                         Width="170"
+                         MinWidth="110"
+                         Width="Auto"
                          MouseLeave="OnMouseLeaveContextMenu"
                          ContextMenuClosing="OnContextMenuClosing">
                     <MenuItem x:Name="BreakItem" Header="{x:Static props:Resources.ConnectorContextMenuHeaderBreakConnection}" 
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml
index 8c911556e2b..8ccf09b09bc 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml
@@ -10,7 +10,7 @@
         xmlns:packagemanager="clr-namespace:Dynamo.PackageManager"
         d:DataContext="{d:DesignInstance Type=packagemanager:PublishPackageViewModel}"
         Name="PublishInfoControl"
-        Width="900"
+        Width="940"
         Height="710"
         MinWidth="630"
         MinHeight="500"
@@ -906,4 +906,4 @@
             </TextBlock>
         </DockPanel>
     </Grid>
-</Window>
\ No newline at end of file
+</Window>