diff --git a/nyaa/templates/layout.html b/nyaa/templates/layout.html
index bd6b801..faf920c 100755
--- a/nyaa/templates/layout.html
+++ b/nyaa/templates/layout.html
@@ -149,7 +149,78 @@
 				{% else %}
 				<form class="navbar-form navbar-right form" action="/" method="get">
 				{% endif %}
-					<div class="input-group search-container">
+
+				{% set nyaa_cats = [('1_0', 'Anime', 'Anime'),
+									('1_1', '- Anime Music Video', 'Anime - AMV'),
+									('1_2', '- English-translated', 'Anime - English'),
+									('1_3', '- Non-English-translated', 'Anime - Non-English'),
+									('1_4', '- Raw', 'Anime - Raw'),
+									('2_0', 'Audio', 'Audio'),
+									('2_1', '- Lossless', 'Audio - Lossless'),
+									('2_2', '- Lossy', 'Audio - Lossy'),
+									('3_0', 'Literature', 'Literature'),
+									('3_1', '- English-translated', 'Literature - English'),
+									('3_2', '- Non-English-translated', 'Literature - Non-English'),
+									('3_3', '- Raw', 'Literature - Raw'),
+									('4_0', 'Live Action', 'Live Action'),
+									('4_1', '- English-translated', 'Live Action - English'),
+									('4_2', '- Idol/Promotional Video', 'Live Action - Idol/PV'),
+									('4_3', '- Non-English-translated', 'Live Action - Non-English'),
+									('4_4', '- Raw', 'Live Action - Raw'),
+									('5_0', 'Pictures', 'Pictures'),
+									('5_1', '- Graphics', 'Pictures - Graphics'),
+									('5_2', '- Photos', 'Pictures - Photos'),
+									('6_0', 'Software', 'Software'),
+									('6_1', '- Applications', 'Software - Apps'),
+									('6_2', '- Games', 'Software - Games')] %}
+									{% set suke_cats = [('1_0', 'Art', 'Art'),
+									('1_1', '- Anime', 'Art - Anime'),
+									('1_2', '- Doujinshi', 'Art - Doujinshi'),
+									('1_3', '- Games', 'Art - Games'),
+									('1_4', '- Manga', 'Art - Manga'),
+									('1_5', '- Pictures', 'Art - Pictures'),
+									('2_0', 'Real Life', 'Real Life'),
+									('2_1', '- Photobooks and Pictures', 'Real Life - Pictures'),
+									('2_2', '- Videos', 'Real Life - Videos')] %}
+				{% if config.SITE_FLAVOR == 'nyaa' %}
+					{% set used_cats = nyaa_cats %}
+				{% elif config.SITE_FLAVOR == 'sukebei' %}
+					{% set used_cats = suke_cats %}
+				{% endif %}
+
+
+					<div class="search-container visible-xs visible-sm">
+						<input type="text" class="form-control" name="q" placeholder="Search..." value="{{ search["term"] if search is defined else '' }}">
+
+						<br>
+						
+						<select class="form-control" title="Filter" data-width="120px" name="f">
+							<option value="0" title="No filter" {% if search is defined and search["quality_filter"] == "0" %}selected{% else %}selected{% endif %}>No filter</option>
+							<option value="1" title="No remakes" {% if search is defined and search["quality_filter"] == "1" %}selected{% endif %}>No remakes</option>
+							<option value="2" title="Trusted only" {% if search is defined and search["quality_filter"] == "2" %}selected{% endif %}>Trusted only</option>
+						</select>
+
+						<br>
+
+						<select class="form-control" title="Category" data-width="200px" name="c">
+							<option value="0_0" title="All categories" {% if search is defined and search["category"] == "0_0" %}selected{% else %}selected{% endif %}>
+								All categories
+							</option>
+							{% for cat_id, cat_name, cat_title in used_cats %}
+							<option value="{{ cat_id }}" title="{{ cat_title }}" {% if search is defined and search.category == cat_id %}selected{% endif %}>
+								{{ cat_name }}
+							</option>
+							{% endfor %}
+						</select>
+
+						<br>
+
+						<button class="btn btn-primary form-control" type="submit">
+							<i class="fa fa-search fa-fw"></i> Search
+						</button>
+					</div>
+
+					<div class="input-group search-container hidden-xs hidden-sm">
 						<input type="text" class="form-control search-bar" name="q" placeholder="Search..." value="{{ search["term"] if search is defined else '' }}">
 						<div class="input-group-btn nav-filter" id="navFilter-criteria">
 							<select class="selectpicker show-tick" title="Filter" data-width="120px" name="f">
@@ -158,45 +229,8 @@
 								<option value="2" title="Trusted only" {% if search is defined and search["quality_filter"] == "2" %}selected{% endif %}>Trusted only</option>
 							</select>
 						</div>
+						
 						<div class="input-group-btn nav-filter" id="navFilter-category">
-							{% set nyaa_cats = [('1_0', 'Anime', 'Anime'),
-												('1_1', '- Anime Music Video', 'Anime - AMV'),
-												('1_2', '- English-translated', 'Anime - English'),
-												('1_3', '- Non-English-translated', 'Anime - Non-English'),
-												('1_4', '- Raw', 'Anime - Raw'),
-												('2_0', 'Audio', 'Audio'),
-												('2_1', '- Lossless', 'Audio - Lossless'),
-												('2_2', '- Lossy', 'Audio - Lossy'),
-												('3_0', 'Literature', 'Literature'),
-												('3_1', '- English-translated', 'Literature - English'),
-												('3_2', '- Non-English-translated', 'Literature - Non-English'),
-												('3_3', '- Raw', 'Literature - Raw'),
-												('4_0', 'Live Action', 'Live Action'),
-												('4_1', '- English-translated', 'Live Action - English'),
-												('4_2', '- Idol/Promotional Video', 'Live Action - Idol/PV'),
-												('4_3', '- Non-English-translated', 'Live Action - Non-English'),
-												('4_4', '- Raw', 'Live Action - Raw'),
-												('5_0', 'Pictures', 'Pictures'),
-												('5_1', '- Graphics', 'Pictures - Graphics'),
-												('5_2', '- Photos', 'Pictures - Photos'),
-												('6_0', 'Software', 'Software'),
-												('6_1', '- Applications', 'Software - Apps'),
-												('6_2', '- Games', 'Software - Games')] %}
-												{% set suke_cats = [('1_0', 'Art', 'Art'),
-												('1_1', '- Anime', 'Art - Anime'),
-												('1_2', '- Doujinshi', 'Art - Doujinshi'),
-												('1_3', '- Games', 'Art - Games'),
-												('1_4', '- Manga', 'Art - Manga'),
-												('1_5', '- Pictures', 'Art - Pictures'),
-												('2_0', 'Real Life', 'Real Life'),
-												('2_1', '- Photobooks and Pictures', 'Real Life - Pictures'),
-												('2_2', '- Videos', 'Real Life - Videos')] %}
-							{% if config.SITE_FLAVOR == 'nyaa' %}
-								{% set used_cats = nyaa_cats %}
-							{% elif config.SITE_FLAVOR == 'sukebei' %}
-								{% set used_cats = suke_cats %}
-							{% endif %}
-
 							<!--
 								On narrow viewports, there isn't enough room to fit the full stuff in the selectpicker, so we show a full-width one on wide viewports, but squish it on narrow ones.
 							-->