diff --git a/Clover/app/src/main/java/org/floens/chan/core/manager/BoardManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/BoardManager.java
index 3d581388..321799bc 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/manager/BoardManager.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/manager/BoardManager.java
@@ -140,6 +140,7 @@ public class BoardManager {
 
                 if (serverBoard.workSafe) {
                     serverBoard.saved = true;
+                    serverBoard.order = allBoards.size();
                 }
 
                 allBoards.add(serverBoard);
@@ -172,6 +173,11 @@ public class BoardManager {
         list.add(new Board("Anime & Manga", "a", true, true));
         list.add(new Board("Comics & Cartoons", "co", true, true));
         list.add(new Board("International", "int", true, true));
+        list.add(new Board("Sports", "sp", true, true));
+        list.add(new Board("Television & Film", "tv", true, true));
+
+        Collections.shuffle(list);
+
         return list;
     }