diff --git a/tubearchivist/home/templates/home/channel_id.html b/tubearchivist/home/templates/home/channel_id.html
index bf1a602..199b348 100644
--- a/tubearchivist/home/templates/home/channel_id.html
+++ b/tubearchivist/home/templates/home/channel_id.html
@@ -66,32 +66,6 @@
         </div>
     {% endif %}
     <div id="notifications" data="channel_id"></div>
-</div>
-<div id="player" class="player-wrapper"></div>
-<div class="boxed-content">
-    <div class="sort">
-        <p>Sort by <span class="settings-current">{{ sort_by }}</span>
-            <select name="sort" id="sort" onchange="sortChange(this.value)">
-                <option value="" disabled selected> -- change sort by -- </option>
-                <option value="published">date published</option>
-                <option value="downloaded">date downloaded</option>
-                <option value="views">views</option>
-                <option value="likes">likes</option>
-            </select>
-            <select name="sord-order" id="sort-order" onchange="sortChange(this.value)">
-                {% if sort_order == "asc" %}
-                    <option value="asc" selected>asc</option>
-                {% else %}
-                    <option value="asc">asc</option>
-                {% endif %}
-                {% if sort_order == "desc" %}
-                    <option value="desc" selected>desc</option>
-                {% else %}
-                    <option value="desc">desc</option>
-                {% endif %}
-            </select>
-        </p>
-    </div>
     <div class="view-controls">
         <div class="toggle">
             <span>Hide watched videos:</span>
@@ -105,10 +79,29 @@
             </div>
         </div>
         <div class="view-icons">
+            <div class="sort">
+                <div id="hidden-form">
+                    <span>Sort by:</span>
+                    <select name="sort" id="sort" onchange="sortChange(this.value)">
+                        <option value="published" {% if sort_by == "published" %}selected{% endif %}>date published</option>
+                        <option value="downloaded" {% if sort_by == "published" %}selected{% endif %}>date downloaded</option>
+                        <option value="views" {% if sort_by == "published" %}selected{% endif %}>views</option>
+                        <option value="likes" {% if sort_by == "published" %}selected{% endif %}>likes</option>
+                    </select>
+                    <select name="sord-order" id="sort-order" onchange="sortChange(this.value)">
+                        <option value="asc" {% if sort_order == "asc" %}selected{% endif %}>asc</option>
+                        <option value="desc" {% if sort_order == "desc" %}selected{% endif %}>desc</option>
+                    </select>
+                </div>
+            </div>
+            <img src="{% static 'img/icon-sort.svg' %}" alt="sort-icon" onclick="showForm()">
             <img src="{% static 'img/icon-gridview.svg' %}" onclick="changeView(this)" data-origin="home" data-value="grid" alt="grid view">
             <img src="{% static 'img/icon-listview.svg' %}" onclick="changeView(this)" data-origin="home" data-value="list" alt="list view">
         </div>
     </div>
+</div>
+<div id="player" class="player-wrapper"></div>
+<div class="boxed-content">
     <div class="video-list {{ view_style }}">
         {% if results %}
             {% for video in results %}
diff --git a/tubearchivist/home/templates/home/home.html b/tubearchivist/home/templates/home/home.html
index 7591ef2..a06f186 100644
--- a/tubearchivist/home/templates/home/home.html
+++ b/tubearchivist/home/templates/home/home.html
@@ -5,33 +5,9 @@
     <div class="title-bar">
         <h1>Recent Videos</h1>
     </div>
-    <div class="info-box info-box-2">
-        <div class="sort">
-            <span>Sort by <span class="settings-current">{{ sort_by }}</span></span>
-            <select name="sort" id="sort" onchange="sortChange(this.value)">
-                <option value="" disabled selected> -- change sort by -- </option>
-                <option value="published">date published</option>
-                <option value="downloaded">date downloaded</option>
-                <option value="views">views</option>
-                <option value="likes">likes</option>
-            </select>
-            <select name="sord-order" id="sort-order" onchange="sortChange(this.value)">
-                {% if sort_order == "asc" %}
-                    <option value="asc" selected>asc</option>
-                {% else %}
-                    <option value="asc">asc</option>
-                {% endif %}
-                {% if sort_order == "desc" %}
-                    <option value="desc" selected>desc</option>
-                {% else %}
-                    <option value="desc">desc</option>
-                {% endif %}
-            </select>
-        </div>
-    </div>
     <div class="view-controls">
         <div class="toggle">
-            <span>Hide watched videos:</span>
+            <span>Hide watched:</span>
             <div class="toggleBox">
                 <input id="hide_watched" onclick="toggleCheckbox(this)" type="checkbox" {% if hide_watched %}checked{% endif %}>
                 {% if hide_watched %}
@@ -42,6 +18,22 @@
             </div>
         </div>
         <div class="view-icons">
+            <div class="sort">
+                <div id="hidden-form">
+                    <span>Sort by:</span>
+                    <select name="sort" id="sort" onchange="sortChange(this.value)">
+                        <option value="published" {% if sort_by == "published" %}selected{% endif %}>date published</option>
+                        <option value="downloaded" {% if sort_by == "published" %}selected{% endif %}>date downloaded</option>
+                        <option value="views" {% if sort_by == "published" %}selected{% endif %}>views</option>
+                        <option value="likes" {% if sort_by == "published" %}selected{% endif %}>likes</option>
+                    </select>
+                    <select name="sord-order" id="sort-order" onchange="sortChange(this.value)">
+                        <option value="asc" {% if sort_order == "asc" %}selected{% endif %}>asc</option>
+                        <option value="desc" {% if sort_order == "desc" %}selected{% endif %}>desc</option>
+                    </select>
+                </div>
+            </div>
+            <img src="{% static 'img/icon-sort.svg' %}" alt="sort-icon" onclick="showForm()">
             <img src="{% static 'img/icon-gridview.svg' %}" onclick="changeView(this)" data-origin="home" data-value="grid" alt="grid view">
             <img src="{% static 'img/icon-listview.svg' %}" onclick="changeView(this)" data-origin="home" data-value="list" alt="list view">
         </div>
diff --git a/tubearchivist/home/templates/home/playlist_id.html b/tubearchivist/home/templates/home/playlist_id.html
index 46bc6fb..f8ad230 100644
--- a/tubearchivist/home/templates/home/playlist_id.html
+++ b/tubearchivist/home/templates/home/playlist_id.html
@@ -25,12 +25,13 @@
         <div class="info-box-item">
             <div>
                 <p>Last refreshed: {{ playlist_info.playlist_last_refresh }}</p>
-                <p>Playlist:</p>
-                {% if playlist_info.playlist_subscribed %}
-                    <button class="unsubscribe" type="button" id="{{ playlist_info.playlist_id }}" onclick="unsubscribe(this.id)" title="Unsubscribe from {{ playlist_info.playlist_name }}">Unsubscribe</button>
-                {% else %}
-                    <button type="button" id="{{ playlist_info.playlist_id }}" onclick="subscribe(this.id)" title="Subscribe to {{ playlist_info.playlist_name }}">Subscribe</button>
-                {% endif %}
+                <p>Playlist:
+                    {% if playlist_info.playlist_subscribed %}
+                        <button class="unsubscribe" type="button" id="{{ playlist_info.playlist_id }}" onclick="unsubscribe(this.id)" title="Unsubscribe from {{ playlist_info.playlist_name }}">Unsubscribe</button>
+                    {% else %}
+                        <button type="button" id="{{ playlist_info.playlist_id }}" onclick="subscribe(this.id)" title="Subscribe to {{ playlist_info.playlist_name }}">Subscribe</button>
+                    {% endif %}
+                </p>
                 {% if playlist_info.playlist_active %}
                     <p>Youtube: <a href="https://www.youtube.com/playlist?list={{ playlist_info.playlist_id }}" target="_blank">Active</a></p>
                 {% else %}
@@ -62,9 +63,6 @@
             </div>
         </div>
     {% endif %}
-</div>
-<div id="player" class="player-wrapper"></div>
-<div class="boxed-content">
     <div class="view-controls">
         <div class="toggle">
             <span>Hide watched videos:</span>
@@ -82,6 +80,9 @@
             <img src="{% static 'img/icon-listview.svg' %}" onclick="changeView(this)" data-origin="home" data-value="list" alt="list view">
         </div>
     </div>
+</div>
+<div id="player" class="player-wrapper"></div>
+<div class="boxed-content">
     <div class="video-list {{ view_style }}">
         {% if results %}
             {% for video in results %}
diff --git a/tubearchivist/static/img/icon-sort.svg b/tubearchivist/static/img/icon-sort.svg
new file mode 100644
index 0000000..f8d55c9
--- /dev/null
+++ b/tubearchivist/static/img/icon-sort.svg
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="500"
+   height="500"
+   viewBox="0 0 132.29197 132.29167"
+   version="1.1"
+   id="svg1303"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="Icons_sort.svg">
+  <defs
+     id="defs1297" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.6482696"
+     inkscape:cx="214.8721"
+     inkscape:cy="136.02434"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g855"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="957"
+     inkscape:window-height="893"
+     inkscape:window-x="941"
+     inkscape:window-y="13"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata1300">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-164.70764)">
+    <g
+       id="g855"
+       transform="matrix(1.9016362,0,0,1.9016362,-197.93838,-58.9418)">
+      <path
+         style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.55118108;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke"
+         d="M 341.125 82.275391 L 315.50977 106.92773 L 241.84375 177.89258 L 266.21289 203.17969 L 309.82617 161.17969 L 306.72266 379.375 C 306.36114 398.60059 319.37807 414.32761 335.91016 414.63867 L 335.91406 414.63477 C 352.44586 414.94597 366.04647 399.71987 366.4082 380.49414 L 369.5 162.97852 L 411.04297 206.11719 L 436.64062 181.44727 L 365.48242 107.57812 L 365.49609 107.5625 L 341.125 82.275391 z M 175.93359 82.277344 L 175.92969 82.28125 C 159.39782 81.970041 145.79728 97.196144 145.43555 116.42188 L 142.34375 333.9375 L 100.80078 290.79883 L 75.203125 315.46875 L 146.36133 389.33789 L 146.3457 389.35156 L 170.7168 414.63867 L 196.33203 389.98633 L 270 319.02344 L 245.63086 293.73633 L 202.01758 335.73633 L 205.12109 117.54102 C 205.48261 98.315428 192.46568 82.588409 175.93359 82.277344 z "
+         transform="matrix(0.13913489,0,0,0.13913489,104.08846,117.60887)"
+         id="path814" />
+    </g>
+  </g>
+</svg>