diff --git a/app/views/authors/_index.html.erb b/app/views/authors/_index.html.erb
index 2033cd3..b01423f 100644
--- a/app/views/authors/_index.html.erb
+++ b/app/views/authors/_index.html.erb
@@ -1,6 +1,6 @@
-<%= render 'layouts/initials' %>
-<%= will_paginate class: "center" %>
+<%= render'layouts/filter' %>
 
+<%= will_paginate class: "center" %>
 <table class="table table-striped authors">
 	<tr>
 		<th>Name</th>
@@ -13,6 +13,4 @@
 	</tr>
 <% end %>
 </table>
-
 <%= will_paginate class: "center" %>
-<%= render 'layouts/perpage' %>
diff --git a/app/views/books/_index.html.erb b/app/views/books/_index.html.erb
index 634492d..89ffd06 100644
--- a/app/views/books/_index.html.erb
+++ b/app/views/books/_index.html.erb
@@ -1,15 +1,10 @@
-<div class="panel panel-default">
-	<div class="panel-heading">
-		<h3 class="panel-title">Filter</h3>
-	</div>
-	<div class="panel-body">
-<% isLatest = session[:sort] == "latest" %>
-<%= link_to "Latest", url_for(sort: (isLatest ? "alpha" : "latest")), class: "btn btn-default btn-sm " + (isLatest ? " active" : ""), remote: true %>
-<%= render'layouts/initials' %>
-	</div>
-</div>
-<%= will_paginate class: "center" %>
+<% content_for :latest_filter do 
+	isLatest = session[:sort] == "latest" %>
+		<%= link_to "Latest", url_for(sort: (isLatest ? "alpha" : "latest")), class: "btn btn-default btn-sm " + (isLatest ? " active" : ""), remote: true %>
+<% end %>
+<%= render'layouts/filter' %>
 
+<%= will_paginate class: "center" %>
 <table class="table table-striped authors">
 	<tr>
 		<th>Name</th>
@@ -33,6 +28,4 @@
 	</tr>
 <% end %>
 </table>
-
 <%= will_paginate class: "center" %>
-<%= render'layouts/perpage' %>
diff --git a/app/views/layouts/_filter.html.erb b/app/views/layouts/_filter.html.erb
new file mode 100644
index 0000000..c9a2247
--- /dev/null
+++ b/app/views/layouts/_filter.html.erb
@@ -0,0 +1,12 @@
+<div class="panel panel-default">
+	<div class="panel-heading">
+		<%= link_to "#filterContent", data: { toggle: "collapse" } do %>
+		<h3 class="panel-title"> Filter </h3>
+		<% end %>
+	</div>
+	<div class="panel-body collapse" id="filterContent">
+		<%= yield(:latest_filter) %>
+		<%= render'layouts/initials' %>
+		<%= render'layouts/perpage' %>
+	</div>
+</div>
diff --git a/app/views/layouts/_initials.html.erb b/app/views/layouts/_initials.html.erb
index 651863d..cfb6ff6 100644
--- a/app/views/layouts/_initials.html.erb
+++ b/app/views/layouts/_initials.html.erb
@@ -1,6 +1,6 @@
 <% initials = ['0'] + ('A'..'Z').to_a %>
 <div class="center">
-	<ul class="pagination">
+	<ul class="pagination btn-sm">
 <% initials.each do |i|
 	is_cur = (i == session[:initial])
 	%>
diff --git a/app/views/series/_index.html.erb b/app/views/series/_index.html.erb
index 2da12c4..85b6158 100644
--- a/app/views/series/_index.html.erb
+++ b/app/views/series/_index.html.erb
@@ -1,6 +1,6 @@
-<%= render'layouts/initials' %>
-<%= will_paginate class: "center" %>
+<%= render'layouts/filter' %>
 
+<%= will_paginate class: "center" %>
 <table class="table table-striped series">
 	<tr>
 		<th>Name</th>
@@ -30,6 +30,4 @@
 	</tr>
 <% end %>
 </table>
-
 <%= will_paginate class: "center" %>
-<%= render'layouts/perpage' %>