diff --git a/src/com/ixab/GUI/MainWindow.form b/src/com/ixab/GUI/MainWindow.form
index 8fef943..f65638f 100644
--- a/src/com/ixab/GUI/MainWindow.form
+++ b/src/com/ixab/GUI/MainWindow.form
@@ -35,7 +35,7 @@
               <text value="Kategorie:"/>
             </properties>
           </component>
-          <grid id="31cd7" layout-manager="GridLayoutManager" row-count="4" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="31cd7" layout-manager="GridLayoutManager" row-count="5" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
               <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -54,7 +54,7 @@
               <grid id="8ebda" binding="panelPreviewImage" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
-                  <grid row="0" column="1" row-span="4" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
+                  <grid row="0" column="1" row-span="5" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
                     <minimum-size width="320" height="180"/>
                     <preferred-size width="320" height="180"/>
                     <maximum-size width="320" height="180"/>
@@ -68,12 +68,12 @@
               </grid>
               <vspacer id="edf84">
                 <constraints>
-                  <grid row="2" column="0" row-span="2" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                  <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
                 </constraints>
               </vspacer>
               <vspacer id="f8cd8">
                 <constraints>
-                  <grid row="2" column="2" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                  <grid row="4" column="2" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
                 </constraints>
               </vspacer>
               <component id="a5ab7" class="javax.swing.JButton" binding="vorherigerButton" default-binding="true">
@@ -100,12 +100,20 @@
                   <text value="Stream abspielen"/>
                 </properties>
               </component>
-              <component id="7c5a1" class="javax.swing.JButton" binding="buttonRemoveStream" default-binding="true">
+              <component id="8b335" class="javax.swing.JButton" binding="buttonReloadStreamData">
+                <constraints>
+                  <grid row="2" column="2" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+                </constraints>
+                <properties>
+                  <text value="Stream Daten neu laden"/>
+                </properties>
+              </component>
+              <component id="48958" class="javax.swing.JButton" binding="buttonReloadAllStreamData">
                 <constraints>
                   <grid row="3" column="2" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
-                  <text value="Ausgw. Stream entfernen"/>
+                  <text value="Alle Stream Daten neu laden"/>
                 </properties>
               </component>
             </children>
@@ -200,17 +208,9 @@
         <properties/>
         <border type="none"/>
         <children>
-          <component id="48958" class="javax.swing.JButton" binding="buttonReloadAllStreamData">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Alle Stream Daten neu laden"/>
-            </properties>
-          </component>
           <component id="95ee2" class="javax.swing.JButton" binding="buttonSettings" default-binding="true">
             <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="0" row-span="2" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
               <text value="Einstellungen"/>
@@ -224,12 +224,12 @@
               <text value="Neuen Stream hinzufügen"/>
             </properties>
           </component>
-          <component id="8b335" class="javax.swing.JButton" binding="buttonReloadStreamData">
+          <component id="7c5a1" class="javax.swing.JButton" binding="buttonRemoveStream" default-binding="true">
             <constraints>
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Stream Daten neu laden"/>
+              <text value="Ausgw. Stream entfernen"/>
             </properties>
           </component>
         </children>
@@ -295,7 +295,9 @@
           </component>
           <component id="35b31" class="javax.swing.JComboBox" binding="comboBoxQuality">
             <constraints>
-              <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+              <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false">
+                <minimum-size width="70" height="-1"/>
+              </grid>
             </constraints>
             <properties/>
           </component>