diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cfee2d6..bf15b91 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,37 +7,29 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e9fa8757-2007-40e1-a6a1-bb77eb745c54" name="Default" comment="version 1: everything seems to be in working order (fingers crossed)">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Checkmark.png" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Checkmark_hover.png" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Plus.png" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Plus_hover.png" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/check.png" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/check_hover.png" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/cross.png" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/DownloadManager$1.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/DownloadManager$1.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/DownloadManager$States.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/DownloadManager$States.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/DownloadManager$StreamGobbler.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/DownloadManager$StreamGobbler.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/DownloadManager.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/DownloadManager.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/GraphicLabel$1.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/GraphicLabel$1.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/GraphicLabel.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/GraphicLabel.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Grid.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Grid.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/HintTextField$1.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/HintTextField$1.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/HintTextField.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/HintTextField.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/LoadingLabel$1.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/LoadingLabel$1.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/LoadingLabel.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/LoadingLabel.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$1.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$1.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$2.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$2.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$3$1$1.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$3$1$1.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$3$1.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$3$1.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$3.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$3.class" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$4.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$4.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$5$1.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$5$1.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$5.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main$5.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Main.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Playlist.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Playlist.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/SpotifyScroll.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/SpotifyScroll.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/SpotifySession.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/SpotifySession.class" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Track.class" afterPath="$PROJECT_DIR$/out/production/Spotify2Mp3/com/gedr/Track.class" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/gedr/DownloadManager.java" afterPath="$PROJECT_DIR$/src/com/gedr/DownloadManager.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/gedr/GraphicLabel.java" afterPath="$PROJECT_DIR$/src/com/gedr/GraphicLabel.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/gedr/Grid.java" afterPath="$PROJECT_DIR$/src/com/gedr/Grid.java" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/gedr/Main.java" afterPath="$PROJECT_DIR$/src/com/gedr/Main.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/gedr/Playlist.java" afterPath="$PROJECT_DIR$/src/com/gedr/Playlist.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/gedr/SpotifySession.java" afterPath="$PROJECT_DIR$/src/com/gedr/SpotifySession.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/gedr/Track.java" afterPath="$PROJECT_DIR$/src/com/gedr/Track.java" />
     </list>
     <ignored path="Spotify 2 MpX.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -59,31 +51,47 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/com/gedr/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="479" column="34" selection-start-line="479" selection-start-column="34" selection-end-line="479" selection-end-column="34" />
+            <state vertical-scroll-proportion="0.7665289">
+              <caret line="503" column="152" selection-start-line="503" selection-start-column="152" selection-end-line="503" selection-end-column="152" />
               <folding>
                 <element signature="imports" expanded="true" />
-                <element signature="class#4263:8793" expanded="false" />
-                <element signature="class#10171:10759" expanded="false" />
-                <element signature="class#16360:16954" expanded="false" />
+                <element signature="class#10071:10659" expanded="false" />
+                <element signature="class#15893:16487" expanded="false" />
+                <element signature="e#16256#16257#0" expanded="true" />
+                <element signature="e#16329#16330#0" expanded="true" />
+                <element signature="e#16404#16405#0" expanded="true" />
+                <element signature="e#16476#16477#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="FileDialog.java" pinned="false" current-in-tab="false">
+        <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_73.jdk/Contents/Home/src.zip!/java/awt/FileDialog.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0">
+              <caret line="375" column="18" selection-start-line="375" selection-start-column="18" selection-end-line="375" selection-end-column="18" />
+              <folding>
+                <element signature="e#12245#12246#0" expanded="true" />
+                <element signature="e#12271#12272#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Grid.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Grid.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/com/gedr/Grid.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.53816044">
-              <caret line="50" column="37" selection-start-line="50" selection-start-column="37" selection-end-line="50" selection-end-column="37" />
+            <state vertical-scroll-proportion="0.0">
+              <caret line="145" column="22" selection-start-line="144" selection-start-column="0" selection-end-line="145" selection-end-column="22" />
               <folding>
-                <element signature="e#8577#8578#0" expanded="true" />
-                <element signature="e#8641#8642#0" expanded="true" />
-                <element signature="e#8684#8685#0" expanded="true" />
-                <element signature="e#8746#8747#0" expanded="true" />
+                <element signature="e#8905#8906#0" expanded="true" />
+                <element signature="e#8969#8970#0" expanded="true" />
+                <element signature="e#9012#9013#0" expanded="true" />
+                <element signature="e#9074#9075#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -93,7 +101,7 @@
         <entry file="file://$PROJECT_DIR$/src/com/gedr/DownloadManager.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="249" column="13" selection-start-line="249" selection-start-column="13" selection-end-line="249" selection-end-column="13" />
+              <caret line="318" column="80" selection-start-line="318" selection-start-column="80" selection-end-line="318" selection-end-column="80" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -127,7 +135,7 @@
         <entry file="file://$PROJECT_DIR$/src/com/gedr/SpotifySession.java">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
-              <caret line="100" column="38" selection-start-line="100" selection-start-column="38" selection-end-line="100" selection-end-column="38" />
+              <caret line="79" column="23" selection-start-line="79" selection-start-column="23" selection-end-line="79" selection-end-column="23" />
               <folding />
             </state>
           </provider>
@@ -158,12 +166,12 @@
         <option value="$PROJECT_DIR$/src/com/gedr/Seperator.java" />
         <option value="$PROJECT_DIR$/src/com/gedr/Separator.java" />
         <option value="$PROJECT_DIR$/src/com/gedr/Playlist.java" />
-        <option value="$PROJECT_DIR$/src/com/gedr/SpotifySession.java" />
         <option value="$PROJECT_DIR$/src/com/gedr/GraphicLabel.java" />
         <option value="$PROJECT_DIR$/src/com/gedr/Track.java" />
+        <option value="$PROJECT_DIR$/src/com/gedr/SpotifySession.java" />
+        <option value="$PROJECT_DIR$/src/com/gedr/Grid.java" />
         <option value="$PROJECT_DIR$/src/com/gedr/DownloadManager.java" />
         <option value="$PROJECT_DIR$/src/com/gedr/Main.java" />
-        <option value="$PROJECT_DIR$/src/com/gedr/Grid.java" />
       </list>
     </option>
   </component>
@@ -611,15 +619,16 @@
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3283582" sideWeight="0.4888889" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3283582" sideWeight="0.4861111" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.50972223" order="10" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.329602" sideWeight="0.5125" order="10" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298611" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.329602" sideWeight="0.49027777" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.329602" sideWeight="0.4875" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31965175" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19027779" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -630,32 +639,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
-    <layout-to-restore>
-      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3283582" sideWeight="0.4888889" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.329602" sideWeight="0.50972223" order="10" side_tool="true" content_ui="tabs" />
-      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3298611" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.329602" sideWeight="0.49027777" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.31965175" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19027779" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39925373" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-    </layout-to-restore>
   </component>
   <component name="Vcs.Log.UiProperties">
     <option name="RECENTLY_FILTERED_USER_GROUPS">
@@ -720,10 +704,10 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="103" column="0" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
           <folding>
-            <element signature="e#8577#8578#0" expanded="true" />
-            <element signature="e#8641#8642#0" expanded="true" />
-            <element signature="e#8684#8685#0" expanded="true" />
-            <element signature="e#8746#8747#0" expanded="true" />
+            <element signature="e#8905#8906#0" expanded="true" />
+            <element signature="e#8969#8970#0" expanded="true" />
+            <element signature="e#9012#9013#0" expanded="true" />
+            <element signature="e#9074#9075#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -752,9 +736,12 @@
           <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="27" selection-end-column="11" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="class#4263:8793" expanded="false" />
-            <element signature="class#10171:10759" expanded="false" />
-            <element signature="class#16360:16954" expanded="false" />
+            <element signature="class#10071:10659" expanded="false" />
+            <element signature="class#15893:16487" expanded="false" />
+            <element signature="e#16256#16257#0" expanded="true" />
+            <element signature="e#16329#16330#0" expanded="true" />
+            <element signature="e#16404#16405#0" expanded="true" />
+            <element signature="e#16476#16477#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -785,10 +772,10 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="103" column="0" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
           <folding>
-            <element signature="e#8577#8578#0" expanded="true" />
-            <element signature="e#8641#8642#0" expanded="true" />
-            <element signature="e#8684#8685#0" expanded="true" />
-            <element signature="e#8746#8747#0" expanded="true" />
+            <element signature="e#8905#8906#0" expanded="true" />
+            <element signature="e#8969#8970#0" expanded="true" />
+            <element signature="e#9012#9013#0" expanded="true" />
+            <element signature="e#9074#9075#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -825,9 +812,12 @@
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
-            <element signature="class#4263:8793" expanded="false" />
-            <element signature="class#10171:10759" expanded="false" />
-            <element signature="class#16360:16954" expanded="false" />
+            <element signature="class#10071:10659" expanded="false" />
+            <element signature="class#15893:16487" expanded="false" />
+            <element signature="e#16256#16257#0" expanded="true" />
+            <element signature="e#16329#16330#0" expanded="true" />
+            <element signature="e#16404#16405#0" expanded="true" />
+            <element signature="e#16476#16477#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -837,10 +827,10 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="103" column="0" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="0" />
           <folding>
-            <element signature="e#8577#8578#0" expanded="true" />
-            <element signature="e#8641#8642#0" expanded="true" />
-            <element signature="e#8684#8685#0" expanded="true" />
-            <element signature="e#8746#8747#0" expanded="true" />
+            <element signature="e#8905#8906#0" expanded="true" />
+            <element signature="e#8969#8970#0" expanded="true" />
+            <element signature="e#9012#9013#0" expanded="true" />
+            <element signature="e#9074#9075#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -922,13 +912,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_73.jdk/Contents/Home/src.zip!/java/awt/FileDialog.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="180" column="11" selection-start-line="180" selection-start-column="11" selection-end-line="180" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
     <entry file="jar://$MAVEN_REPOSITORY$/com/github/axet/vget/1.1.23/vget-1.1.23.jar!/com/github/axet/vget/vhs/YouTubeQParser.class">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -1074,9 +1057,9 @@
         <state vertical-scroll-proportion="0.0">
           <caret line="26" column="43" selection-start-line="26" selection-start-column="43" selection-end-line="26" selection-end-column="43" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#449#450#0" expanded="true" />
-            <element signature="e#500#501#0" expanded="true" />
+            <element signature="imports" expanded="false" />
+            <element signature="e#449#450#0" expanded="false" />
+            <element signature="e#500#501#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1089,22 +1072,33 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/gedr/SpotifySession.java">
+    <entry file="file://$PROJECT_DIR$/src/com/gedr/Track.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="100" column="38" selection-start-line="100" selection-start-column="38" selection-end-line="100" selection-end-column="38" />
+          <caret line="21" column="40" selection-start-line="21" selection-start-column="40" selection-end-line="21" selection-end-column="40" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/gedr/Track.java">
+    <entry file="file://$PROJECT_DIR$/src/com/gedr/SpotifySession.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="21" column="40" selection-start-line="21" selection-start-column="40" selection-end-line="21" selection-end-column="40" />
+          <caret line="79" column="23" selection-start-line="79" selection-start-column="23" selection-end-line="79" selection-end-column="23" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_73.jdk/Contents/Home/src.zip!/java/awt/FileDialog.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0">
+          <caret line="375" column="18" selection-start-line="375" selection-start-column="18" selection-end-line="375" selection-end-column="18" />
+          <folding>
+            <element signature="e#12245#12246#0" expanded="true" />
+            <element signature="e#12271#12272#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/com/gedr/GraphicLabel.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -1115,15 +1109,15 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/gedr/Main.java">
+    <entry file="file://$PROJECT_DIR$/src/com/gedr/Grid.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="479" column="34" selection-start-line="479" selection-start-column="34" selection-end-line="479" selection-end-column="34" />
+          <caret line="145" column="22" selection-start-line="144" selection-start-column="0" selection-end-line="145" selection-end-column="22" />
           <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="class#4263:8793" expanded="false" />
-            <element signature="class#10171:10759" expanded="false" />
-            <element signature="class#16360:16954" expanded="false" />
+            <element signature="e#8905#8906#0" expanded="true" />
+            <element signature="e#8969#8970#0" expanded="true" />
+            <element signature="e#9012#9013#0" expanded="true" />
+            <element signature="e#9074#9075#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1131,22 +1125,25 @@
     <entry file="file://$PROJECT_DIR$/src/com/gedr/DownloadManager.java">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
-          <caret line="249" column="13" selection-start-line="249" selection-start-column="13" selection-end-line="249" selection-end-column="13" />
+          <caret line="318" column="80" selection-start-line="318" selection-start-column="80" selection-end-line="318" selection-end-column="80" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/com/gedr/Grid.java">
+    <entry file="file://$PROJECT_DIR$/src/com/gedr/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.53816044">
-          <caret line="50" column="37" selection-start-line="50" selection-start-column="37" selection-end-line="50" selection-end-column="37" />
+        <state vertical-scroll-proportion="0.7665289">
+          <caret line="503" column="152" selection-start-line="503" selection-start-column="152" selection-end-line="503" selection-end-column="152" />
           <folding>
-            <element signature="e#8577#8578#0" expanded="true" />
-            <element signature="e#8641#8642#0" expanded="true" />
-            <element signature="e#8684#8685#0" expanded="true" />
-            <element signature="e#8746#8747#0" expanded="true" />
+            <element signature="imports" expanded="true" />
+            <element signature="class#10071:10659" expanded="false" />
+            <element signature="class#15893:16487" expanded="false" />
+            <element signature="e#16256#16257#0" expanded="true" />
+            <element signature="e#16329#16330#0" expanded="true" />
+            <element signature="e#16404#16405#0" expanded="true" />
+            <element signature="e#16476#16477#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/out/production/Spotify2Mp3/com/gedr/DownloadManager$1.class b/out/production/Spotify2Mp3/com/gedr/DownloadManager$1.class
index 8aad0a9..7954081 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/DownloadManager$1.class and b/out/production/Spotify2Mp3/com/gedr/DownloadManager$1.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/DownloadManager$States.class b/out/production/Spotify2Mp3/com/gedr/DownloadManager$States.class
index 6dcf878..1ef9730 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/DownloadManager$States.class and b/out/production/Spotify2Mp3/com/gedr/DownloadManager$States.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/DownloadManager$StreamGobbler.class b/out/production/Spotify2Mp3/com/gedr/DownloadManager$StreamGobbler.class
index 7a7f26e..c9a13e6 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/DownloadManager$StreamGobbler.class and b/out/production/Spotify2Mp3/com/gedr/DownloadManager$StreamGobbler.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/DownloadManager.class b/out/production/Spotify2Mp3/com/gedr/DownloadManager.class
index 76ea27a..eff2ecd 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/DownloadManager.class and b/out/production/Spotify2Mp3/com/gedr/DownloadManager.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/Grid.class b/out/production/Spotify2Mp3/com/gedr/Grid.class
index 018ff11..0454d15 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/Grid.class and b/out/production/Spotify2Mp3/com/gedr/Grid.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/HintTextField$1.class b/out/production/Spotify2Mp3/com/gedr/HintTextField$1.class
index 9fb1830..bfbd82b 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/HintTextField$1.class and b/out/production/Spotify2Mp3/com/gedr/HintTextField$1.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/HintTextField.class b/out/production/Spotify2Mp3/com/gedr/HintTextField.class
index 0e1d47f..5f56e0f 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/HintTextField.class and b/out/production/Spotify2Mp3/com/gedr/HintTextField.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/LoadingLabel$1.class b/out/production/Spotify2Mp3/com/gedr/LoadingLabel$1.class
index 30f8cdf..e868562 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/LoadingLabel$1.class and b/out/production/Spotify2Mp3/com/gedr/LoadingLabel$1.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/LoadingLabel.class b/out/production/Spotify2Mp3/com/gedr/LoadingLabel.class
index 58d0e88..1053a4a 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/LoadingLabel.class and b/out/production/Spotify2Mp3/com/gedr/LoadingLabel.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/Main$1.class b/out/production/Spotify2Mp3/com/gedr/Main$1.class
index 7a3cdf2..1ecb3b7 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/Main$1.class and b/out/production/Spotify2Mp3/com/gedr/Main$1.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/Main$2.class b/out/production/Spotify2Mp3/com/gedr/Main$2.class
index 0e692f5..d707187 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/Main$2.class and b/out/production/Spotify2Mp3/com/gedr/Main$2.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/Main$3$1$1.class b/out/production/Spotify2Mp3/com/gedr/Main$3$1$1.class
index 8b11895..9726254 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/Main$3$1$1.class and b/out/production/Spotify2Mp3/com/gedr/Main$3$1$1.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/Main$3$1.class b/out/production/Spotify2Mp3/com/gedr/Main$3$1.class
index 261c125..6fe6570 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/Main$3$1.class and b/out/production/Spotify2Mp3/com/gedr/Main$3$1.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/Main$3.class b/out/production/Spotify2Mp3/com/gedr/Main$3.class
index 41b8519..2ab6235 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/Main$3.class and b/out/production/Spotify2Mp3/com/gedr/Main$3.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/Main$4.class b/out/production/Spotify2Mp3/com/gedr/Main$4.class
index 2845b78..e6cc050 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/Main$4.class and b/out/production/Spotify2Mp3/com/gedr/Main$4.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/Main$5$1.class b/out/production/Spotify2Mp3/com/gedr/Main$5$1.class
index 5d00ef3..97986b1 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/Main$5$1.class and b/out/production/Spotify2Mp3/com/gedr/Main$5$1.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/Main$5.class b/out/production/Spotify2Mp3/com/gedr/Main$5.class
index 195b20d..309ab37 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/Main$5.class and b/out/production/Spotify2Mp3/com/gedr/Main$5.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/Main.class b/out/production/Spotify2Mp3/com/gedr/Main.class
index 06cda79..eed23bc 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/Main.class and b/out/production/Spotify2Mp3/com/gedr/Main.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/SpotifyCheckBox.class b/out/production/Spotify2Mp3/com/gedr/SpotifyCheckBox.class
index 82e205e..1fdab7e 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/SpotifyCheckBox.class and b/out/production/Spotify2Mp3/com/gedr/SpotifyCheckBox.class differ
diff --git a/out/production/Spotify2Mp3/com/gedr/SpotifyScroll.class b/out/production/Spotify2Mp3/com/gedr/SpotifyScroll.class
index fde1278..d519502 100644
Binary files a/out/production/Spotify2Mp3/com/gedr/SpotifyScroll.class and b/out/production/Spotify2Mp3/com/gedr/SpotifyScroll.class differ
diff --git a/src/com/gedr/DownloadManager.java b/src/com/gedr/DownloadManager.java
index a474710..ffef749 100644
--- a/src/com/gedr/DownloadManager.java
+++ b/src/com/gedr/DownloadManager.java
@@ -16,6 +16,9 @@
 import java.io.*;
 import java.util.Map;
 import java.util.Random;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Created by gedr on 30/07/2016.
@@ -23,7 +26,7 @@
 public class DownloadManager {
 
     public enum States {
-        QUEUE, RUNNING, DONE, RETRYING, EXTRACTING_DONE, ERROR, DOWNLOADING, EXTRACTING;
+        QUEUE, RUNNING, DONE, RETRYING, EXTRACTING_DONE, ERROR, DOWNLOADING, EXTRACTING
     }
 
     Playlist[] playlists;
@@ -37,6 +40,8 @@ public enum States {
 
     static File temp;
 
+    boolean downloading;
+
     public DownloadManager(Playlist[] playlists) {
         this.playlists = playlists;
 
@@ -45,10 +50,23 @@ public DownloadManager(Playlist[] playlists) {
 
     public void startDownload() {
         chooseOutput();
-        if(output != null)
+        if(output != null) {
+            ses.scheduleAtFixedRate(new Runnable() {
+                @Override
+                public void run() {
+                    if(System.currentTimeMillis() - lastEvent > 45000) {
+                        if(downloading) {
+                            retryDownload();
+                            p.destroy();
+                        }
+                    }
+                }
+            }, 10, 10, TimeUnit.SECONDS);
             nextPlaylist();
-        else
+
+        } else
             finish();
+
     }
 
 
@@ -78,8 +96,8 @@ private void retryDownload() {
             trackIndex--;
         else
             retrys = -1;
-        nextTrack();
         retrys++;
+        nextTrack();
     }
 
     public void nextTrack() {
@@ -107,6 +125,7 @@ public void nextTrack() {
     public String findYoutubeUri(Track track, int i) {
         String url = "";
         if(track.id.equals("next_track")) {
+            System.out.println("URL not found for \"" + track.name + "\"");
             return "next_track";
         }
         if(!track.id.equals("")) {
@@ -115,7 +134,7 @@ public String findYoutubeUri(Track track, int i) {
         String keyword = null;
         switch(i) {
             case -1:
-                keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "") + " " + track.artists[0].replace("$", "s").replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "");
+                keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "").replace("\"","") + " " + track.artists[0].replace("$", "s").replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "");
                 keyword = keyword.replace(" ", "+");
 
                 String duration = "sp=" + ((track.duration / 60) > 4 ? "medium" : "short") + "&";
@@ -124,7 +143,7 @@ public String findYoutubeUri(Track track, int i) {
                 url = "https://www.googleapis.com/youtube/v3/search?" + duration + quality + "type=video&part=snippet&maxResults=1&q=" + keyword + "&key=AIzaSyDMUtaSnR0hadvSt4jPCCoPJeRh5LbiU5w";
                 break;
             case 1:
-                keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "") + " " + track.artists[0].replace("$", "s").replace("[", " ").replace("]", " ") + " official lyrics " + (track.explicit ? " explicit" : "");
+                keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "").replace("\"","") + " " + track.artists[0].replace("$", "s").replace("[", " ").replace("]", " ") + " lyrics " + (track.explicit ? " explicit" : "");
                 keyword = keyword.replace(" ", "+");
 
                 duration = "sp=" + ((track.duration / 60) > 4 ? "medium" : "short") + "&";
@@ -133,21 +152,21 @@ public String findYoutubeUri(Track track, int i) {
                 url = "https://www.googleapis.com/youtube/v3/search?" + duration + quality + "type=video&part=snippet&maxResults=1&order=viewCount&q=" + keyword + "&key=AIzaSyDMUtaSnR0hadvSt4jPCCoPJeRh5LbiU5w";
                 break;
             case 2:
-                keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "") + " " + track.artists[0].replace("$", "s").replace("[", " ").replace("]", " ") + " lyrics" + (track.explicit ? " explicit" : "");
+                keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "").replace("\"","") + " " + track.artists[0].replace("$", "s").replace("[", " ").replace("]", " ") + " official lyrics" + (track.explicit ? " explicit" : "");
                 keyword = keyword.replace(" ", "+");
                 duration = "sp=" + ((track.duration / 60) > 4 ? "medium" : "short") + "&";
                 //String duration = "";
                 url = "https://www.googleapis.com/youtube/v3/search?" + duration + "type=video&part=snippet&maxResults=1&order=viewCount&q=" + keyword + "&key=AIzaSyDMUtaSnR0hadvSt4jPCCoPJeRh5LbiU5w";
                 break;
             case 3:
-                keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "") + " " + track.artists[0] + " lyrics";
+                keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "").replace("\"","") + " " + track.artists[0] + " lyrics";
                 keyword = keyword.replace(" ", "+");
                 duration = "sp=" + ((track.duration / 60) > 4 ? "medium" : "short") + "&";
 
                 url = "https://www.googleapis.com/youtube/v3/search?" + duration + "type=video&part=snippet&maxResults=1&order=viewCount&q=" + keyword + "&key=AIzaSyDMUtaSnR0hadvSt4jPCCoPJeRh5LbiU5w";
                 break;
             case 4:
-                keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "") + " " + track.artists[0];
+                keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "").replace("\"","") + " " + track.artists[0];
                 keyword = keyword.replace(" ", "+");
                 duration = "&sp=" + ((track.duration / 60) > 4 ? "medium" : "short") + "&";
 
@@ -155,9 +174,9 @@ public String findYoutubeUri(Track track, int i) {
                 break;
             case 5:
                 if(track.artists.length > 1)
-                    keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "") + " " + track.artists[1];
+                    keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "").replace("\"","") + " " + track.artists[1];
                 else
-                    keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "") + " " + track.artists[0];
+                    keyword = track.name.replace("[", " ").replace("]", " ").replace("(","").replace(")","").replace(".", "").replace("\"","") + " " + track.artists[0];
 
                 keyword = keyword.replace(" ", "+");
 
@@ -178,6 +197,7 @@ public String findYoutubeUri(Track track, int i) {
             if(i != -1) {
                 return findYoutubeUri(track, ++attempt);
             } else {
+                System.out.println("URL not found for \"" + track.name + "\" { keyword=\"" + keyword + " }");
                 track.id = "next_track";
                 return "next_track";
             }
@@ -187,10 +207,10 @@ public String findYoutubeUri(Track track, int i) {
         JSONArray array = ob.getJSONArray("items");
 
         if(array.isEmpty()) {
-            System.out.println("attempt " + (attempt) + " at getting URL...");
             if(i != -1) {
                 return findYoutubeUri(track, ++attempt);
             } else {
+                System.out.println("URL not found for \"" + track.name + "\" { keyword=\"" + keyword + " }");
                 track.id = "next_track";
                 return "next_track";
             }
@@ -201,6 +221,7 @@ public String findYoutubeUri(Track track, int i) {
             if(i != -1) {
                 return findYoutubeUri(track, ++attempt);
             } else {
+                System.out.println("URL not found for \"" + track.name + "\" { keyword=\"" + keyword + " }");
                 track.id = "next_track";
                 return "next_track";
             }
@@ -299,6 +320,7 @@ public void downloadTrack(String name, String artist, String url) {
                     if(duration > currentTrack.ytDuration - 10) {
                         complete = true;
                         updateUI(currentTrack, States.DONE, "", "");
+                        System.out.println("\""+ name + "\" is already downloaded.");
                     } else {
                         file.delete();
                     }
@@ -323,6 +345,10 @@ public void downloadTrack(String name, String artist, String url) {
         }
     }
 
+    ScheduledExecutorService ses = Executors.newSingleThreadScheduledExecutor();
+
+
+    Process p;
 
     private String executeCommand(String[] commands) {
 
@@ -332,25 +358,31 @@ private String executeCommand(String[] commands) {
         }
         System.out.println();
 
-        Process p;
+
         try {
             p = Runtime.getRuntime().exec(commands);
             StreamGobbler outputGobbler = new StreamGobbler(p.getInputStream(), "OUTPUT");
             StreamGobbler errorGobbler = new StreamGobbler(p.getErrorStream(), "ERROR");
             errorGobbler.start();
             outputGobbler.start();
+
+
             p.waitFor();
 
 
+
+// when finished
+
         } catch(Exception e) {
             e.printStackTrace();
             return "error";
         }
+        ses.shutdown();
 
         return output.toString();
 
     }
-
+    long lastEvent;
     private class StreamGobbler extends Thread {
         InputStream is;
         String type;
@@ -370,10 +402,12 @@ public void run() {
 
                 while((line = br.readLine()) != null) {
                     System.out.println(line);
+                    lastEvent = System.currentTimeMillis();
                     if(line.contains("Downloading webpage") || line.contains("Downloading video info webpage") || line.contains("Extracting video information") || line.contains("Downloading MPD manifest")) {
                         updateUI(currentTrack, States.EXTRACTING, level++ + "", "");
-                    }
+                    } else
                     if(line.contains("[download]")) {
+                        downloading = true;
                         if(line.substring(11, 17).replace(" ", "").replaceAll("[^\\d.]", "").equals("100")) {
                             updateUI(currentTrack, States.DOWNLOADING, "100", "");
                         } else if(!line.substring(12, 17).replace(" ", "").replaceAll("[^\\d.]", "").equals("")) {
@@ -400,6 +434,7 @@ public void run() {
                         }
                     }
                     if(line.startsWith("size=")) {
+                        downloading = false;
                         String time = line.substring(21, 29).replace(":", "");
 
                         int h = Integer.parseInt(time.substring(0, 2));
@@ -409,10 +444,12 @@ public void run() {
                         updateUI(currentTrack, States.RETRYING, s + "", "");
                     }
                     if(line.startsWith("video:")) {
+                        downloading = false;
                         updateUI(currentTrack, States.DONE, "", "");
                     }
 
                     if(line.startsWith("ERROR: ")) {
+                        downloading = false;
                         retrying = true;
                         updateUI(currentTrack, States.ERROR, "", "");
                         stop();
diff --git a/src/com/gedr/Grid.java b/src/com/gedr/Grid.java
index 9be706e..8032c19 100644
--- a/src/com/gedr/Grid.java
+++ b/src/com/gedr/Grid.java
@@ -16,7 +16,7 @@ public class Grid extends JPanel {
 
     //Font font = new Font(Font.SANS_SERIF, Font.PLAIN, 11);
     public Grid(Playlist[] playlists) {
-        setPreferredSize(new Dimension((int) (Main.screen.width * .6) - 24, (playlists.length) * 29));
+        setPreferredSize(new Dimension((int) (Main.frame.getWidth()) - 24, (playlists.length) * 29));
         setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
         setOpaque(true);
         setBackground(new Color(28, 28, 28));
@@ -95,8 +95,8 @@ public Grid(Playlist[] playlists) {
         }
     }
 
-    public Grid(Track[] tracklist) {
-        setPreferredSize(new Dimension((int) (Main.screen.width * .6) - 24, (tracklist.length + 1) * (29 + 8)));
+    public Grid(Track[] tracklist, String name) {
+        setPreferredSize(new Dimension((int) Main.frame.getWidth(), (tracklist.length + 1) * (29 + 8)));
         setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
         setOpaque(true);
         setBackground(new Color(28, 28, 28));
@@ -124,10 +124,9 @@ public Grid(Track[] tracklist) {
         grid.setOpaque(false);
         JPanel flowWrap = new JPanel(new GridLayout());
         flowWrap.setOpaque(false);
-        flowWrap.setPreferredSize(new Dimension((int) (Main.screen.width * .6 * .6) - 6, 40));
         JLabel art = new JLabel("ARTIST");
-        art.setFont(Main.fontNormal.deriveFont(12f));
         art.setForeground(Color.gray);
+        art.setFont(Main.fontNormal.deriveFont(12f));
 
         //grid.setPreferredSize(new Dimension(100, 40));
 
@@ -135,18 +134,25 @@ public Grid(Track[] tracklist) {
         JPanel Flow = new JPanel(new GridBagLayout());
         //Flow.setPreferredSize(new Dimension(70, 40));
         //Flow.add(loadingImg);
+        JLabel playlistLabel = new JLabel(name +"      ");
+        //playlistLabel.setPreferredSize(new Dimension(300, 30));
+        playlistLabel.setFont(Main.fontBold.deriveFont(15f));
+        playlistLabel.setForeground(Color.lightGray);
         Flow.setOpaque(false);
+        Flow.add(playlistLabel);
+        flowWrap.setPreferredSize(new Dimension((int) (Main.frame.getWidth() * .6) - playlistLabel.getPreferredSize().width - 6, 40));
+
 
         grid.add(art);
         flowWrap.add(art);
         flowWrap.setAlignmentY(JPanel.BOTTOM_ALIGNMENT);
         JPanel border = new JPanel(new BorderLayout());
-        border.add(flowWrap, BorderLayout.CENTER);
-        //border.add(Flow, BorderLayout.EAST);
+        border.add(flowWrap, BorderLayout.WEST);
+        border.add(playlistLabel, BorderLayout.EAST);
         border.setOpaque(false);
         wrap.add(border, BorderLayout.EAST);
         title.add(wrap, BorderLayout.CENTER);
-        title.setMinimumSize(new Dimension(Main.frame.getWidth(), 30));
+        title.setMinimumSize(new Dimension(Main.frame.getWidth()-10, 30));
         add(Box.createVerticalStrut(4));
         add(title);
         add(new Separator(false));
@@ -171,21 +177,21 @@ public Grid(Track[] tracklist) {
             wrap.add(songLabel, BorderLayout.CENTER);
             flowWrap = new JPanel(new FlowLayout(FlowLayout.LEFT));
             flowWrap.setOpaque(false);
-            flowWrap.setPreferredSize(new Dimension((int) (Main.screen.width * .6 * .6), 30));
+            flowWrap.setPreferredSize(new Dimension((int) (Main.frame.getWidth() * .6), 30));
             String artist = "";
             for(String s : track.artists) {
                 artist += s + ", ";
             }
             artist = artist.substring(0, artist.length() - 2);
             art = new JLabel(artist);
-            art.setPreferredSize(new Dimension((int) (Main.screen.width * .6 * .6), (int) art.getPreferredSize().getHeight()));
+            art.setPreferredSize(new Dimension((int) (Main.frame.getWidth() * .6), (int) art.getPreferredSize().getHeight()));
 
             art.setForeground(new Color(240, 240, 240));
             art.setFont(Main.fontNormal.deriveFont(13f));
             flowWrap.add(art);
             wrap.add(flowWrap, BorderLayout.EAST);
             row.add(wrap, BorderLayout.CENTER);
-            row.setMinimumSize(new Dimension(Main.frame.getWidth(), 38));
+            row.setMinimumSize(new Dimension(Main.frame.getWidth()-10, 38));
             add(row, "wrap");
             if(i != tracklist.length)
                 add(new Separator(false));
diff --git a/src/com/gedr/Main.java b/src/com/gedr/Main.java
index 561f360..bb60cb7 100644
--- a/src/com/gedr/Main.java
+++ b/src/com/gedr/Main.java
@@ -1,12 +1,7 @@
 package com.gedr;
 
-
 import javax.imageio.ImageIO;
 import javax.swing.*;
-import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.LineBorder;
-import javax.swing.plaf.ScrollBarUI;
 import javax.swing.plaf.basic.BasicScrollBarUI;
 import javax.swing.text.JTextComponent;
 import java.awt.*;
@@ -25,33 +20,27 @@
 import java.security.CodeSource;
 import java.security.ProtectionDomain;
 import java.util.ArrayList;
-import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
-
-import static java.nio.file.Files.setPosixFilePermissions;
 
 public class Main {
 
-
     public static String success = "";
     public static String extractedJarPath;
     private final HintTextField idField;
-    private JPanel loadingWrap;
     private JButton downloadButton;
     private boolean settingUp = true;
     public static JScrollPane scroll;
 
     public static int trackNumber = 0;
+    private LoadingLabel loadingImg;
 
     public static void scrollDown() {
-//        JViewport view = scroll.getViewport();
-//        view.setViewPosition(new Point((int) view.getViewPosition().getX(), (int) view.getViewPosition().getY() + 30));
-//        scroll.setViewport(view);
+        //        JViewport view = scroll.getViewport();
+        //        view.setViewPosition(new Point((int) view.getViewPosition().getX(), (int) view.getViewPosition().getY() + 30));
+        //        scroll.setViewport(view);
 
         JScrollBar vscroll = scroll.getVerticalScrollBar();
 
@@ -62,19 +51,18 @@ public static void scrollDown() {
 
     public static void main(String[] args) {
 
-
         //javax.swing.UIManager.put("Button.background", new javax.swing.plaf.ColorUIResource(38,38,38));
         //UIManager.put(scroll, Color.RED);
 
         new Main();
 
-//        try {
-//            VGet v = new VGet(new URL("http://www.youtube.com/watch?v=1JyA1HZmjg8"), new File("/"));
-//            v.download();
-//
-//        } catch (Exception e) {
-//            throw new RuntimeException(e);
-//        }
+        //        try {
+        //            VGet v = new VGet(new URL("http://www.youtube.com/watch?v=1JyA1HZmjg8"), new File("/"));
+        //            v.download();
+        //
+        //        } catch (Exception e) {
+        //            throw new RuntimeException(e);
+        //        }
     }
 
     public static final Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
@@ -150,8 +138,10 @@ public void run() {
                         os = "mac";
                     } //add linux.
 
-                    if(!finalPrefix.endsWith(".jar"))
+                    if(!finalPrefix.endsWith(".jar")) { //for IDE development
+                        settingUp = false;
                         return;
+                    }
                     jar = new java.util.jar.JarFile(finalPrefix);
 
                     java.util.Enumeration enums = jar.entries();
@@ -199,13 +189,11 @@ public void run() {
                         }
                     }
 
-
                 } catch(IOException e) {
                     e.printStackTrace();
                 }
                 settingUp = false;
-                if(loadingWrap != null)
-                    loadingWrap.setVisible(false);
+                if(loadingImg != null) loadingImg.setVisible(false);
 
             }
         }).start();
@@ -213,8 +201,11 @@ public void run() {
         frame = new JFrame("generic title");
 
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); //handle that later
-        frame.setBounds((int) (screen.getWidth() * .2), (int) (screen.getHeight() * .2), (int) (screen.getWidth() * .6), (int) (screen.getHeight() * .6));
+        frame.setSize(864, 540);
+        frame.setLocation((int) screen.getWidth() / 2 - 864 / 2, (int) screen.getHeight() / 2 - 540 / 2);
         frame.setResizable(false);
+
+        System.out.println(frame.getWidth() + ", " + frame.getHeight());
         pane = (JPanel) frame.getContentPane();
         pane.setOpaque(true);
         pane.setBackground(new Color(28, 28, 28));
@@ -266,10 +257,8 @@ public void mouseExited(MouseEvent e) {
             public void actionPerformed(ActionEvent e) {
                 new Thread(new Runnable() {
                     public void run() {
-                        if(idField.getText().equals(""))
-                            return;
-                        if(idField.loading)
-                            return;
+                        if(idField.getText().equals("")) return;
+                        if(idField.loading) return;
                         idField.loading = true;
                         idField.repaint();
                         idField.revalidate();
@@ -339,12 +328,13 @@ public void run() {
 
     }
 
+    boolean running = true;
+
     public void setupPlaylistGrid(Playlist[] playlists) {
         pane.removeAll();
         pane.setOpaque(true);
         pane.setBackground(new Color(28, 28, 28));
 
-
         grid = new Grid(playlists);
         JPanel wrapp = new JPanel();
         wrapp.setLayout(new BoxLayout(wrapp, BoxLayout.Y_AXIS));
@@ -355,7 +345,7 @@ public void setupPlaylistGrid(Playlist[] playlists) {
         wrapp.add(grid);
         JPanel flow = new JPanel(new FlowLayout(FlowLayout.CENTER));
         flow.setOpaque(false);
-        flow.setPreferredSize(new Dimension(Main.frame.getSize().width, (29 + 10) * (playlists.length )));
+        flow.setPreferredSize(new Dimension(Main.frame.getSize().width, (29 + 10) * (playlists.length)));
 
         flow.add(wrapp);
         scroll = new JScrollPane(flow, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
@@ -366,28 +356,17 @@ public void setupPlaylistGrid(Playlist[] playlists) {
         scroll.getVerticalScrollBar().setBorder(null);
         scroll.getVerticalScrollBar().setUI(new SpotifyScroll());
 
-
         pane.add(BorderLayout.CENTER, scroll);
-        LoadingLabel loadingImg = new LoadingLabel();
-        loadingImg.setPreferredSize(new Dimension(26, 26));
+        loadingImg = new LoadingLabel(4);
+        loadingImg.setPreferredSize(new Dimension(42, 42));
+        JPanel gridBag = new JPanel(new GridBagLayout());
+        gridBag.add(loadingImg);
+        gridBag.setOpaque(false);
+        gridBag.setPreferredSize(new Dimension(100, 50));
 
         JPanel divider = new JPanel(new BorderLayout());
+        divider.add(gridBag, BorderLayout.CENTER);
         divider.setOpaque(false);
-        JLabel loadingText = new JLabel(" Setting up... ");
-        loadingText.setFont(Main.fontNormal.deriveFont(13f));
-        loadingText.setForeground(Color.white);
-
-        loadingWrap = new JPanel(new BorderLayout());
-        loadingWrap.setOpaque(false);
-        loadingWrap.add(BorderLayout.CENTER, loadingText);
-        loadingWrap.add(BorderLayout.EAST, loadingImg);
-
-
-        JPanel paneel = new JPanel();
-        //paneel.setBackground(new Color(38, 38, 38));
-
-        paneel.add(loadingWrap); //lmao these names
-        paneel.setOpaque(false);
 
         downloadButton = new JButton("Download Selected");
         downloadButton.setFont(Main.fontNormal.deriveFont(14f));
@@ -416,28 +395,28 @@ public void mouseExited(MouseEvent e) {
                 downloadButton.setForeground(Color.gray);
             }
         });
-        downloadButton.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
+        downloadButton.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 5));
         downloadButton.setOpaque(false);
 
         JPanel flowWrap = new JPanel(new FlowLayout(FlowLayout.RIGHT));
         flowWrap.setOpaque(false);
-        flowWrap.setPreferredSize(new Dimension((int) (Main.screen.width * .6 - paneel.getPreferredSize().getWidth()), 50));
+        flowWrap.setPreferredSize(new Dimension((int) (Main.screen.width * .6 - loadingImg.getPreferredSize().getWidth()), 50));
         JPanel gridWrap = new JPanel(new GridBagLayout());
         gridWrap.add(downloadButton);
         gridWrap.setPreferredSize(new Dimension(downloadButton.getPreferredSize().width, 50));
         gridWrap.setOpaque(false);
         flowWrap.add(gridWrap);
         //wrap.setPreferredSize(new Dimension(-1, 35));
-        divider.add(paneel, BorderLayout.WEST);
+        divider.add(gridBag, BorderLayout.WEST);
         divider.add(flowWrap, BorderLayout.EAST);
         divider.setOpaque(true);
         divider.setBackground(new Color(38, 38, 38));
         pane.add(BorderLayout.NORTH, divider);
 
         if(!settingUp) {
-            loadingWrap.setVisible(false);
+            loadingImg.setVisible(false);
         } else {
-            loadingWrap.setVisible(true);
+            loadingImg.setVisible(true);
         }
 
         downloadButton.addActionListener(new ActionListener() {
@@ -446,26 +425,27 @@ public void actionPerformed(ActionEvent e) {
                 if(settingUp) {
                     return;
                 }
-                if(System.getProperty("os.name").contains("Windows")) {
-                    JFileChooser fileChooser;
-                    int returnValue;
-                    do {
-                        fileChooser = new JFileChooser();
-                        fileChooser.setBounds((int) (Main.screen.getWidth() * .2), (int) (Main.screen.getHeight() * .2), (int) (Main.screen.getWidth() * .6), (int) (Main.screen.getHeight() * .6));
-                        returnValue = fileChooser.showOpenDialog(null);
-                    } while(returnValue != JFileChooser.APPROVE_OPTION && fileChooser.getSelectedFile().isDirectory());
-                    DownloadManager.output = fileChooser.getSelectedFile();
-                } else {//unix
-                    System.setProperty("apple.awt.fileDialogForDirectories", "true");
-                    FileDialog fd = new FileDialog(Main.frame);
-                    fd.setBounds((int) (Main.screen.getWidth() * .2), (int) (Main.screen.getHeight() * .2), (int) (Main.screen.getWidth() * .6), (int) (Main.screen.getHeight() * .6));
-                    fd.setBounds(Main.frame.getBounds());
-                    fd.setVisible(true);
-                    if(fd.getFile() != null) {
-                        DownloadManager.output = new File(fd.getDirectory() + "/" + fd.getFile());
-                        System.setProperty("apple.awt.fileDialogForDirectories", "false");
-                    }
-                }
+                //                JFileChooser fileChooser = new JFileChooser();
+                //                fileChooser.setAcceptAllFileFilterUsed(false);
+                //                fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+                //                fileChooser.setBounds((int) (Main.screen.getWidth() * .2), (int) (Main.screen.getHeight() * .2), (int) (Main.screen.getWidth() * .6), (int) (Main.screen.getHeight() * .6));
+                //                if(fileChooser.showOpenDialog(null) == JFileChooser.APPROVE_OPTION) {
+                //                    System.out.println("getCurrentDirectory(): " + fileChooser.getCurrentDirectory());
+                //                    System.out.println("getSelectedFile() : " + fileChooser.getSelectedFile());
+                //                    if(fileChooser.getSelectedFile() == null)
+                //                        DownloadManager.output = fileChooser.getCurrentDirectory();
+                //                    else DownloadManager.output = fileChooser.getSelectedFile();
+                //                }
+                System.setProperty("apple.awt.fileDialogForDirectories", "true");
+                FileDialog fc = new FileDialog(frame, "Choose directory to download playlist into");
+                fc.setVisible(true);
+                String fn = fc.getFile();
+                if(fn == null) return;
+                else DownloadManager.output = new File(fc.getDirectory() + "/" + fn);
+                System.out.println("out : " + DownloadManager.output.getAbsolutePath());
+                System.setProperty("apple.awt.fileDialogForDirectories", "false");
+
+                loadingImg.setVisible(true);
 
                 if(DownloadManager.output != null) {
                     DownloadManager.temp = new File(DownloadManager.output.getAbsolutePath() + "/_temp");
@@ -480,42 +460,48 @@ public void actionPerformed(ActionEvent e) {
                     if(box.checked) {
                         for(Playlist p : playlists) {
                             if(p.name.equals(box.getName())) {
-                                toDownload.add(p);
-                                currentSession.getTracks(p);
+                                if(p.total != 0) {
+                                    toDownload.add(p);
+                                    currentSession.getTracks(p);
+                                }
                             }
                         }
                     }
                 }
+
                 if(toDownload.isEmpty()) {
                     return;
                 }
 
                 int height = 39; //adjust for dividers
-                pane.removeAll();
-                pane.repaint();
-                pane.revalidate();
 
                 JPanel tracklistWrap = new JPanel();
                 tracklistWrap.setLayout(new BoxLayout(tracklistWrap, BoxLayout.Y_AXIS));
                 int size = 0;
                 int index = 0;
                 for(Playlist playlist : toDownload) {
-                    Grid grid = new Grid(playlist.tracks);
-                    System.out.println(playlist.tracks.length);
-                    grid.setPreferredSize(new Dimension(Main.frame.getSize().width, height* (playlist.tracks.length+1) + 5*playlist.tracks.length+1));
-                    tracklistWrap.add(grid);
-                    if(index++ +1!= toDownload.size()) {
-                        Separator sep = new Separator(true);
-                        tracklistWrap.add(Box.createVerticalStrut(12));
-                        sep.setMinimumSize(new Dimension(Main.frame.getWidth()-20, 20));
-                        tracklistWrap.add(sep);
-                        tracklistWrap.add(Box.createVerticalStrut(9));
+                    if(playlist.tracks.length != 0) {
+                        Grid grid = new Grid(playlist.tracks, playlist.name);
+                        System.out.println(playlist.name + " - " + playlist.tracks.length);
+                        grid.setPreferredSize(new Dimension(Main.frame.getSize().width, height * (playlist.tracks.length + 1) + 5 * playlist.tracks.length + 1));
+                        tracklistWrap.add(grid);
+                        if(index++ + 1 != toDownload.size()) {
+                            Separator sep = new Separator(true);
+                            tracklistWrap.add(Box.createVerticalStrut(12));
+                            sep.setMinimumSize(new Dimension(Main.frame.getWidth() - 20, 20));
+                            tracklistWrap.add(sep);
+                            tracklistWrap.add(Box.createVerticalStrut(9));
 
+                        }
+                        size += playlist.tracks.length + 1;
+                    } else {
+                        toDownload.remove(playlist);
+                        toDownload.trimToSize();
                     }
-                    size += playlist.tracks.length + 1;
                 }
                 trackNumber = size;
-                tracklistWrap.setPreferredSize(new Dimension(Main.frame.getSize().width, (int) ((index-1)*22) + (height)* (size)));
+                //System.out.println(toDownload.size());
+                tracklistWrap.setPreferredSize(new Dimension(Main.frame.getSize().width, (index) * 28 + (height) * (size) - (toDownload.size() == 1 ? 36 : 0)));
 
                 tracklistWrap.setOpaque(false);
                 JPanel flow = new JPanel(new FlowLayout(FlowLayout.CENTER));
@@ -523,16 +509,22 @@ public void actionPerformed(ActionEvent e) {
                 //flow.setPreferredSize(new Dimension(Main.frame.getSize().width, (29 + 8) * (size)));
 
                 flow.add(tracklistWrap);
-                scroll = new JScrollPane(flow, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+                scroll = new JScrollPane(flow, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
                 scroll.getVerticalScrollBar().setUnitIncrement(19);
                 scroll.getViewport().setOpaque(true);
                 scroll.getViewport().setBackground(new Color(28, 28, 28));
                 scroll.setBorder(null);
                 scroll.getVerticalScrollBar().setBorder(null);
+
                 scroll.getVerticalScrollBar().setUI(new SpotifyScroll());
 
+                pane.removeAll();
+                pane.repaint();
+                pane.revalidate();
                 pane.add(BorderLayout.CENTER, scroll);
                 pane.setOpaque(false);
+                running = false;
+
                 new Thread(new Runnable() {
                     @Override
                     public void run() {
@@ -540,16 +532,10 @@ public void run() {
                     }
                 }).start();
 
-//                        grid = new Grid(playlists.toArray(new Playlist[playlists.size()]));
-//                        JPanel wrapp = new JPanel(new GridLayout());
-//                        wrapp.add(grid);
-
             }
         });
-        pane.revalidate();
     }
 
-
     private String executeCommand(String command) {
 
         StringBuffer output = new StringBuffer();
@@ -558,8 +544,7 @@ private String executeCommand(String command) {
         try {
             p = Runtime.getRuntime().exec(command);
             p.waitFor();
-            BufferedReader reader =
-                    new BufferedReader(new InputStreamReader(p.getInputStream()));
+            BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
 
             String line = "";
             while((line = reader.readLine()) != null) {
@@ -574,9 +559,7 @@ private String executeCommand(String command) {
 
     }
 
-
-    private static URI getJarURI()
-            throws URISyntaxException {
+    private static URI getJarURI() throws URISyntaxException {
         final ProtectionDomain domain;
         final CodeSource source;
         final URL url;
@@ -590,10 +573,7 @@ private static URI getJarURI()
         return (uri);
     }
 
-    private static URI getFile(final URI where,
-                               final String fileName)
-            throws ZipException,
-            IOException {
+    private static URI getFile(final URI where, final String fileName) throws IOException {
         final File location;
         final URI fileURI;
 
@@ -617,9 +597,7 @@ private static URI getFile(final URI where,
         return (fileURI);
     }
 
-    private static URI extract(final ZipFile zipFile,
-                               final String fileName)
-            throws IOException {
+    private static URI extract(final ZipFile zipFile, final String fileName) throws IOException {
         final File tempFile;
         final ZipEntry entry;
         final InputStream zipStream;
@@ -665,7 +643,6 @@ private static void close(final Closeable stream) {
         }
     }
 
-
     public static void failureLogin() {
         formPane.setVisible(true);
         JLabel warning = new JLabel("User ID does not exist");
@@ -675,7 +652,6 @@ public static void failureLogin() {
 
 }
 
-
 class HintTextField extends JTextField implements FocusListener {
 
     private final String hint;
@@ -730,8 +706,7 @@ public String getText() {
 
     protected void paintComponent(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-                RenderingHints.VALUE_ANTIALIAS_ON);
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         Shape border = getBorderShape();
 
         Stroke os = g2d.getStroke();
@@ -754,7 +729,7 @@ public void run() {
                             long now = System.currentTimeMillis();
                             while(System.currentTimeMillis() < now + 2) {
                             }
-                            degree+=.2;
+                            degree += .2;
                             repaint();
                             revalidate();
                         }
@@ -777,24 +752,18 @@ public void run() {
             g2d.drawString("!", getWidth() - 17, 20);
         }
 
-
         super.paintComponent(g);
     }
 
     private Shape getBorderShape() {
         JTextComponent component = this;
         if(round > 0) {
-            return new RoundRectangle2D.Double(shadeWidth, shadeWidth,
-                    component.getWidth() - shadeWidth * 2 - 1,
-                    component.getHeight() - shadeWidth * 2 - 1, round * 2, round * 2);
+            return new RoundRectangle2D.Double(shadeWidth, shadeWidth, component.getWidth() - shadeWidth * 2 - 1, component.getHeight() - shadeWidth * 2 - 1, round * 2, round * 2);
         } else {
-            return new Rectangle2D.Double(shadeWidth, shadeWidth,
-                    component.getWidth() - shadeWidth * 2 - 1,
-                    component.getHeight() - shadeWidth * 2 - 1);
+            return new Rectangle2D.Double(shadeWidth, shadeWidth, component.getWidth() - shadeWidth * 2 - 1, component.getHeight() - shadeWidth * 2 - 1);
         }
     }
 
-
     public boolean contains(int x, int y) {
         if(shape == null || !shape.getBounds().equals(getBounds())) {
             shape = new RoundRectangle2D.Float(0, 0, getWidth() - 1, getHeight() - 1, 15, 15);
@@ -813,7 +782,6 @@ protected void paintTrack(Graphics g, JComponent c, Rectangle trackBounds) {
         g.fillRect(0, 0, (int) trackBounds.getWidth(), (int) trackBounds.getHeight());
     }
 
-
     @Override
     protected JButton createDecreaseButton(int orientation) {
         JButton button = new JButton("zero button");
@@ -846,7 +814,7 @@ protected void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds) {
         g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
         g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
 
-        g2d.setColor(new Color(52,52,52));
+        g2d.setColor(new Color(52, 52, 52));
         g2d.translate(thumbBounds.x, thumbBounds.y);
         g2d.fillRoundRect(4, 3, (int) thumbBounds.getWidth() - 7, (int) thumbBounds.getHeight() - 6, 10, 8);
         g2d.translate(-thumbBounds.x, -thumbBounds.y);
@@ -858,7 +826,7 @@ protected void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds) {
 class LoadingLabel extends JLabel {
     int degree = 0;
 
-    public LoadingLabel() {
+    public LoadingLabel(int i) {
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -888,7 +856,8 @@ public void paintComponent(Graphics g) {
         g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE);
 
         Color green = new Color(9, 166, 73);
-        g2d.setStroke(new BasicStroke(2));
+
+        g2d.setStroke(new BasicStroke(getHeight() / 12));
 
         g2d.setColor(green);
         int r = Math.min(getWidth(), getHeight()) - 10;