diff --git a/src/megabasterd/DownloadView.form b/src/megabasterd/DownloadView.form
index a78a37fa5..d67668931 100644
--- a/src/megabasterd/DownloadView.form
+++ b/src/megabasterd/DownloadView.form
@@ -97,15 +97,17 @@
                   <Component id="pause_button" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="stop_button" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="keep_temp_checkbox" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Group type="103" alignment="3" groupAlignment="3" attributes="0">
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Group type="103" alignment="0" groupAlignment="3" attributes="0">
                       <Component id="close_button" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="restart_button" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="stop_button" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="keep_temp_checkbox" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
               </Group>
-              <EmptySpace max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
diff --git a/src/megabasterd/DownloadView.java b/src/megabasterd/DownloadView.java
index b26eddcd6..969d76041 100644
--- a/src/megabasterd/DownloadView.java
+++ b/src/megabasterd/DownloadView.java
@@ -322,13 +322,14 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen
                     .addComponent(speed_label)
                     .addComponent(pause_button))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(stop_button)
-                    .addComponent(keep_temp_checkbox)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                         .addComponent(close_button)
-                        .addComponent(restart_button)))
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                        .addComponent(restart_button))
+                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                        .addComponent(stop_button)
+                        .addComponent(keep_temp_checkbox)))
+                .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents
 
diff --git a/src/megabasterd/UploadView.form b/src/megabasterd/UploadView.form
index d9a8b28ba..6b6fb162a 100644
--- a/src/megabasterd/UploadView.form
+++ b/src/megabasterd/UploadView.form
@@ -93,14 +93,14 @@
                   <Component id="pause_button" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
-              <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="stop_button" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Group type="103" alignment="3" groupAlignment="3" attributes="0">
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Group type="103" alignment="0" groupAlignment="3" attributes="0">
                       <Component id="close_button" alignment="3" min="-2" max="-2" attributes="0"/>
                       <Component id="restart_button" alignment="3" min="-2" max="-2" attributes="0"/>
                   </Group>
+                  <Component id="stop_button" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
diff --git a/src/megabasterd/UploadView.java b/src/megabasterd/UploadView.java
index c65fc8680..2127872e0 100644
--- a/src/megabasterd/UploadView.java
+++ b/src/megabasterd/UploadView.java
@@ -286,12 +286,12 @@ public final class UploadView extends javax.swing.JPanel implements Transference
                     .addComponent(speed_label)
                     .addComponent(pause_button))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
-                    .addComponent(stop_button)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                         .addComponent(close_button)
-                        .addComponent(restart_button)))
-                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                        .addComponent(restart_button))
+                    .addComponent(stop_button))
+                .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents