diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index b0797692..d3eda4e1 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -109,23 +109,23 @@
                   HorizontalAlignment="Right" VerticalAlignment="Bottom"
                   Cursor="BottomRightCorner"
                   Tag="{x:Static WindowEdge.SouthEast}"/>
-          
-          <Border x:Name="PART_ContentRoot"
-                  Background="{DynamicResource Brush.Window}"
-                  BorderBrush="{DynamicResource Brush.Border0}"
-                  BorderThickness="1"
-                  Margin="{TemplateBinding Padding}"
-                  CornerRadius="8"
-                  Effect="drop-shadow(0 0 12 #A0000000)"
-                  ClipToBounds="True">
-            <VisualLayerManager>
-              <ContentPresenter Name="PART_ContentPresenter"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                Content="{TemplateBinding Content}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-            </VisualLayerManager>
-          </Border>
+
+          <Grid Margin="{TemplateBinding Padding}" Effect="drop-shadow(0 0 12 #A0000000)">
+            <Border x:Name="PART_ContentRoot"
+                    Background="{DynamicResource Brush.Window}"
+                    BorderBrush="{DynamicResource Brush.Border0}"
+                    BorderThickness="1"
+                    CornerRadius="8"
+                    ClipToBounds="True">
+              <VisualLayerManager>
+                <ContentPresenter Name="PART_ContentPresenter"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                  Content="{TemplateBinding Content}"
+                                  HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+              </VisualLayerManager>
+            </Border>
+          </Grid>
         </Grid>
       </ControlTemplate>
     </Setter>
diff --git a/src/Views/Clone.axaml b/src/Views/Clone.axaml
index 47dca098..25c46a00 100644
--- a/src/Views/Clone.axaml
+++ b/src/Views/Clone.axaml
@@ -10,46 +10,71 @@
   <StackPanel Orientation="Vertical" Margin="8,0,0,0">
     <TextBlock Classes="bold" FontSize="18" Text="{DynamicResource Text.Clone}"/>
 
-    <Grid Margin="8,16,0,0" Height="28" ColumnDefinitions="140,*">
-      <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="0,0,8,0" Text="{DynamicResource Text.Clone.RemoteURL}"/>
-      <TextBox Grid.Column="1" CornerRadius="3" Text="{Binding Remote, Mode=TwoWay}" v:AutoFocusBehaviour.IsEnabled="True"/>
-    </Grid>
-    <Grid Margin="8,4,0,0" Height="28" ColumnDefinitions="140,*" IsVisible="{Binding UseSSH}">
-      <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="0,0,8,0" Text="{DynamicResource Text.SSHKey}"/>
-      <TextBox Grid.Column="1"
+    <Grid Margin="8,16,0,0" RowDefinitions="32,Auto,32,32,32" ColumnDefinitions="Auto,*">
+      <TextBlock Grid.Row="0" Grid.Column="0" 
+                 HorizontalAlignment="Right" 
+                 Margin="0,0,8,0" 
+                 Text="{DynamicResource Text.Clone.RemoteURL}"/>
+      <TextBox Grid.Row="0" Grid.Column="1" 
+               Height="28"
+               CornerRadius="3" 
+               Text="{Binding Remote, Mode=TwoWay}" 
+               v:AutoFocusBehaviour.IsEnabled="True"/>
+
+      <TextBlock Grid.Row="1" Grid.Column="0"
+                 HorizontalAlignment="Right"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.SSHKey}"
+                 IsVisible="{Binding UseSSH}"/>
+      <TextBox Grid.Row="1" Grid.Column="1"
                x:Name="TxtSshKey"
                Height="28"
                CornerRadius="3"
                Watermark="{DynamicResource Text.SSHKey.Placeholder}"
-               Text="{Binding SSHKey, Mode=TwoWay}">
+               Text="{Binding SSHKey, Mode=TwoWay}"
+               IsVisible="{Binding UseSSH}">
         <TextBox.InnerRightContent>
-          <Button Classes="icon_button" Width="30" Height="30" Click="SelectSSHKey">
+          <Button Classes="icon_button" Width="28" Height="28" Click="SelectSSHKey">
             <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
           </Button>
         </TextBox.InnerRightContent>
       </TextBox>
-    </Grid>
-    <Grid Margin="8,4,0,0" Height="28" ColumnDefinitions="140,*">
-      <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="0,0,8,0" Text="{DynamicResource Text.Clone.ParentFolder}"/>
-      <TextBox Grid.Column="1"
+
+      <TextBlock Grid.Row="2" Grid.Column="0" 
+                 HorizontalAlignment="Right" 
+                 Margin="0,0,8,0" 
+                 Text="{DynamicResource Text.Clone.ParentFolder}"/>
+      <TextBox Grid.Row="2" Grid.Column="1"
                x:Name="TxtParentFolder"
                Height="28"
                CornerRadius="3"
                Text="{Binding ParentFolder, Mode=TwoWay}">
         <TextBox.InnerRightContent>
-          <Button Classes="icon_button" Width="30" Height="30" Margin="4,0,0,0" Click="SelectParentFolder">
+          <Button Classes="icon_button" Width="28" Height="28" Margin="4,0,0,0" Click="SelectParentFolder">
             <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
           </Button>
         </TextBox.InnerRightContent>
       </TextBox>
-    </Grid>
-    <Grid Margin="8,4,0,0" Height="28" ColumnDefinitions="140,*">
-      <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="0,0,8,0" Text="{DynamicResource Text.Clone.LocalName}"/>
-      <TextBox Grid.Column="1" CornerRadius="3" Watermark="{DynamicResource Text.Clone.LocalName.Placeholder}" Text="{Binding Local, Mode=TwoWay}"/>
-    </Grid>
-    <Grid Margin="8,4,0,0" Height="28" ColumnDefinitions="140,*">
-      <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="0,0,8,0" Text="{DynamicResource Text.Clone.AdditionalParam}"/>
-      <TextBox Grid.Column="1" CornerRadius="3" Watermark="{DynamicResource Text.Clone.AdditionalParam.Placeholder}" Text="{Binding ExtraArgs, Mode=TwoWay}"/>
+
+      <TextBlock Grid.Row="3" Grid.Column="0" 
+                 HorizontalAlignment="Right" 
+                 Margin="0,0,8,0" 
+                 Text="{DynamicResource Text.Clone.LocalName}"/>
+      <TextBox Grid.Row="3" Grid.Column="1"
+               Height="28"
+               CornerRadius="3"
+               Watermark="{DynamicResource Text.Clone.LocalName.Placeholder}" 
+               Text="{Binding Local, Mode=TwoWay}"/>
+
+      <TextBlock Grid.Row="4" Grid.Column="0" 
+                 HorizontalAlignment="Right" 
+                 Margin="0,0,8,0" 
+                 Text="{DynamicResource Text.Clone.AdditionalParam}"/>
+      <TextBox Grid.Row="4" Grid.Column="1"
+               Height="28"
+               CornerRadius="3" 
+               Watermark="{DynamicResource Text.Clone.AdditionalParam.Placeholder}" 
+               Text="{Binding ExtraArgs, Mode=TwoWay}"/>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 94076e25..255d57bd 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -250,59 +250,46 @@
     </ContentControl>
 
     <!-- Popup container -->
-    <Grid Grid.Row="1" Margin="0,36,0,0" IsVisible="{Binding ActivePage.Popup, Converter={x:Static ObjectConverters.IsNotNull}}">
+    <Grid Grid.Row="1" Margin="0,36,0,0" IsVisible="{Binding ActivePage.Popup, Converter={x:Static ObjectConverters.IsNotNull}}" ClipToBounds="True">
       <Border Background="Transparent" PointerPressed="OnPopupCancelByClickMask"/>
 
-      <Grid Width="500" HorizontalAlignment="Center" VerticalAlignment="Top">                
-        <ContentControl Content="{Binding ActivePage.Popup}" ClipToBounds="True">
+      <Border Width="500" HorizontalAlignment="Center" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #8F000000)" CornerRadius="0,0,4,4" ClipToBounds="True">                
+        <ContentControl Content="{Binding ActivePage.Popup}" Background="{DynamicResource Brush.Popup}">
           <ContentControl.DataTemplates>
-            <DataTemplate DataType="vm:Popup">
-              <Border Margin="8,0,8,8"
-                      Background="{DynamicResource Brush.Popup}"
-                      BorderBrush="{DynamicResource Brush.Border0}"
-                      CornerRadius="0,0,4,4">
-                <Border.BorderThickness>
-                  <OnPlatform Default="0" Linux="1,0,1,1"/>
-                </Border.BorderThickness>
+            <DataTemplate DataType="vm:Popup">  
+              <StackPanel Orientation="Vertical" Background="{DynamicResource Brush.Popup}">
+                <!-- Popup Widget -->
+                <ContentPresenter Margin="8,16,8,8"
+                                  Content="{Binding View}"
+                                  IsHitTestVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}"/>
 
-                <Border.Effect>
-                  <OnPlatform Default="drop-shadow(0 0 8 #8F000000)" Linux="{x:Null}"/>
-                </Border.Effect>
-                
-                <StackPanel Margin="8" Orientation="Vertical">
-                  <!-- Popup Widget -->
-                  <ContentPresenter Margin="0,8"
-                                    Content="{Binding View}"
-                                    IsHitTestVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}"/>
-
-                  <!-- Options -->
-                  <StackPanel Margin="0,8,0,0"
-                              Height="32"
-                              Orientation="Horizontal"
-                              HorizontalAlignment="Right"
-                              IsVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}">
-                    <Button Classes="flat primary"
-                            Width="80"
-                            Content="{DynamicResource Text.Sure}"
-                            Click="OnPopupSure"
-                            HotKey="Enter"/>
-                    <Button Classes="flat"
-                            Width="80"
-                            Margin="8,0,0,0"
-                            Content="{DynamicResource Text.Cancel}"
-                            Click="OnPopupCancel"/>
-                  </StackPanel>
-
-                  <!-- Running -->
-                  <v:PopupRunningStatus Margin="8"
-                                        Description="{Binding ProgressDescription}"
-                                        IsVisible="{Binding InProgress}"/>
+                <!-- Options -->
+                <StackPanel Margin="8,4,8,8"
+                            Height="32"
+                            Orientation="Horizontal"
+                            HorizontalAlignment="Right"
+                            IsVisible="{Binding InProgress, Converter={x:Static BoolConverters.Not}}">
+                  <Button Classes="flat primary"
+                          Width="80"
+                          Content="{DynamicResource Text.Sure}"
+                          Click="OnPopupSure"
+                          HotKey="Enter"/>
+                  <Button Classes="flat"
+                          Width="80"
+                          Margin="8,0,0,0"
+                          Content="{DynamicResource Text.Cancel}"
+                          Click="OnPopupCancel"/>
                 </StackPanel>
-              </Border>
+
+                <!-- Running -->
+                <v:PopupRunningStatus Margin="12,8"
+                                      Description="{Binding ProgressDescription}"
+                                      IsVisible="{Binding InProgress}"/>
+              </StackPanel>
             </DataTemplate>
           </ContentControl.DataTemplates>
         </ContentControl>
-      </Grid>
+      </Border>
     </Grid>
 
     <!-- Notification container -->
diff --git a/src/Views/PopupRunningStatus.axaml b/src/Views/PopupRunningStatus.axaml
index c2759715..5cc9a4bd 100644
--- a/src/Views/PopupRunningStatus.axaml
+++ b/src/Views/PopupRunningStatus.axaml
@@ -8,7 +8,7 @@
              x:Class="SourceGit.Views.PopupRunningStatus"
              x:Name="me">
   <StackPanel Orientation="Vertical">
-    <Rectangle Height="1" Margin="-8,0" HorizontalAlignment="Stretch" Fill="{DynamicResource Brush.Border1}" />
+    <Rectangle Height="1" HorizontalAlignment="Stretch" Fill="{DynamicResource Brush.Border1}" />
     
     <StackPanel Orientation="Horizontal" Margin="0,8">
       <ContentPresenter x:Name="icon" Width="12" Height="12"/>