diff --git a/boards.php b/boards.php
index de7f15e8..e9e5e29f 100644
--- a/boards.php
+++ b/boards.php
@@ -130,7 +130,7 @@ if ($admin) {
 		unset($boards[$i]['img']);
 	}
 
-	array_splice($boards, 20);
+	array_splice($boards, 48);
 
 	$boards = array_values($boards);
 
diff --git a/js/update_boards.js b/js/update_boards.js
index 439ddb14..401e17d7 100644
--- a/js/update_boards.js
+++ b/js/update_boards.js
@@ -1,6 +1,27 @@
 $(document).ready(function(){
 
 window.boards = new Array();
+
+if (window.Options && Options.get_tab('general')) {
+	Options.extend_tab("general", "<label id='show-top'><input type='checkbox' /> "+_('Show top boards')+"</label>");
+
+	if (typeof localStorage.show_top === 'undefined') {
+		localStorage.show_top = 'true';
+		var show_top = JSON.parse(localStorage.show_top);
+		$('#show-top>input').attr('checked', 'checked');
+	} else {
+		var show_top = JSON.parse(localStorage.show_top);
+		if (show_top) $('#show-top>input').attr('checked', 'checked');
+	}
+
+
+	$('#show-top>input').on('change', function() {
+		var show_top = ($(this).is(':checked'));
+
+		localStorage.show_top = JSON.stringify(show_top);
+	});
+}
+
 function handle_boards(data) {
 	$.each(data, function(k, v) {
 		if (v.uri != 'meta' && v.uri != 'b') {
@@ -9,12 +30,12 @@ function handle_boards(data) {
 	})
 
 	if (boards[0]) {
-		$('.sub[data-description="2"]').after('<span class="sub" data-description="3"> [ '+boards.slice(0,15).join(" / ")+' ] </span>');
+		$('.sub[data-description="2"]').after('<span class="sub" data-description="3"> [ '+boards.slice(0,25).join(" / ")+' ] </span>');
 	}
-	
 }
 
-$.getJSON("/boards-top20.json", handle_boards)
-
+if (!(window.location.pathname != '' && window.location.pathname != '/' && window.location.pathname != '/index.html' && typeof show_top !== "undefined" && !show_top)) {
+	$.getJSON("/boards-top20.json", handle_boards)
+}
 
 });