diff --git a/templates/partials/flags/filters.tpl b/templates/partials/flags/filters.tpl
index f6694f6..d2e67e7 100644
--- a/templates/partials/flags/filters.tpl
+++ b/templates/partials/flags/filters.tpl
@@ -15,52 +15,57 @@
 	</div>
 	<div class="panel-body">
 		<form role="form" component="flags/filters">
-			<div class="form-group">
-				<label for="filter-state">[[flags:filter-state]]</label>
-				<select class="form-control" id="filter-state" name="state">
-					<option value="">[[flags:state-all]]</option>
-					<option value="open">[[flags:state-open]]</option>
-					<option value="wip">[[flags:state-wip]]</option>
-					<option value="resolved">[[flags:state-resolved]]</option>
-					<option value="rejected">[[flags:state-rejected]]</option>
-				</select>
-			</div>
+			<fieldset>
+				<div class="form-group">
+					<label for="filter-state">[[flags:filter-state]]</label>
+					<select class="form-control" id="filter-state" name="state">
+						<option value="">[[flags:state-all]]</option>
+						<option value="open">[[flags:state-open]]</option>
+						<option value="wip">[[flags:state-wip]]</option>
+						<option value="resolved">[[flags:state-resolved]]</option>
+						<option value="rejected">[[flags:state-rejected]]</option>
+					</select>
+				</div>
 
-			<div class="form-group">
-				<label for="filter-type">[[flags:filter-type]]</label>
-				<select class="form-control" id="filter-type" name="type">
-					<option value="">[[flags:filter-type-all]]</option>
-					<option value="post">[[flags:filter-type-post]]</option>
-					<option value="user">[[flags:filter-type-user]]</option>
-				</select>
-			</div>
+				<div class="form-group">
+					<label for="filter-type">[[flags:filter-type]]</label>
+					<select class="form-control" id="filter-type" name="type">
+						<option value="">[[flags:filter-type-all]]</option>
+						<option value="post">[[flags:filter-type-post]]</option>
+						<option value="user">[[flags:filter-type-user]]</option>
+					</select>
+				</div>
 
-			<div class="form-group">
-				<label for="filter-assignee">[[flags:filter-assignee]]</label>
-				<input type="number" class="form-control" id="filter-assignee" name="assignee" min="0" />
-			</div>
+				<div class="form-group">
+					<label for="filter-cid">[[flags:filter-cid]]</label>
+					<select class="form-control" id="filter-cid" name="cid" multiple="true">
+						<option value="">[[flags:filter-cid-all]]</option>
+						{{{each categories}}}
+						<option value="@key">@value</option>
+						{{{end}}}
+					</select>
+				</div>
+			</fieldset>
 
-			<div class="form-group">
-				<label for="filter-cid">[[flags:filter-cid]]</label>
-				<select class="form-control" id="filter-cid" name="cid" multiple="true">
-					<option value="">[[flags:filter-cid-all]]</option>
-					{{{each categories}}}
-					<option value="@key">@value</option>
-					{{{end}}}
-				</select>
-			</div>
+			<fieldset class="collapse" id="more-filters">
+				<div class="form-group">
+					<label for="filter-assignee">[[flags:filter-assignee]]</label>
+					<input type="number" class="form-control" id="filter-assignee" name="assignee" min="0" />
+				</div>
 
-			<div class="form-group">
-				<label for="filter-targetUid">[[flags:filter-targetUid]]</label>
-				<input type="number" class="form-control" id="filter-targetUid" name="targetUid" min="0" />
-			</div>
+				<div class="form-group">
+					<label for="filter-targetUid">[[flags:filter-targetUid]]</label>
+					<input type="number" class="form-control" id="filter-targetUid" name="targetUid" min="0" />
+				</div>
 
-			<div class="form-group">
-				<label for="filter-reporterId">[[flags:filter-reporterId]]</label>
-				<input type="number" class="form-control" id="filter-reporterId" name="reporterId" min="0" />
-			</div>
+				<div class="form-group">
+					<label for="filter-reporterId">[[flags:filter-reporterId]]</label>
+					<input type="number" class="form-control" id="filter-reporterId" name="reporterId" min="0" />
+				</div>
+			</fieldset>
 
-			<button type="button" class="btn btn-primary btn-block">[[flags:apply-filters]]</button>
+			<button type="button" class="btn btn-link btn-block" data-toggle="collapse" data-target="#more-filters">[[flags:more-filters]]&nbsp;<span class="caret"></span></button>
+			<button type="button" id="apply-filters" class="btn btn-primary btn-block">[[flags:apply-filters]]</button>
 		</form>
 	</div>
 </div>
\ No newline at end of file