diff --git a/app/Caches/TaggedArticleList.php b/app/Caches/TaggedArticleList.php
index 1c5c6df0..05640fff 100644
--- a/app/Caches/TaggedArticleList.php
+++ b/app/Caches/TaggedArticleList.php
@@ -13,7 +13,7 @@ use App\Repos\Article as ArticleRepo;
 class TaggedArticleList extends Cache
 {
 
-    protected $limit = 5;
+    protected $limit = 15;
 
     protected $lifetime = 3600;
 
diff --git a/app/Caches/TaggedQuestionList.php b/app/Caches/TaggedQuestionList.php
index f76a5b29..f6adb8b4 100644
--- a/app/Caches/TaggedQuestionList.php
+++ b/app/Caches/TaggedQuestionList.php
@@ -13,7 +13,7 @@ use App\Repos\Question as QuestionRepo;
 class TaggedQuestionList extends Cache
 {
 
-    protected $limit = 5;
+    protected $limit = 15;
 
     protected $lifetime = 3600;
 
diff --git a/app/Http/Admin/Views/public/login.volt b/app/Http/Admin/Views/public/login.volt
index df649e74..66c249d9 100644
--- a/app/Http/Admin/Views/public/login.volt
+++ b/app/Http/Admin/Views/public/login.volt
@@ -35,7 +35,7 @@
 
     <style>
         html {
-            height: 95%;
+            height: 100%;
         }
 
         body {
@@ -72,7 +72,7 @@
     </script>
 
     <script>
-        jquery('body').buoyant({
+        $('body').buoyant({
             elementClass: 'circles',
             numberOfItems: 20,
             minRadius: 5,
diff --git a/app/Services/Logic/Article/RelatedArticleList.php b/app/Services/Logic/Article/RelatedArticleList.php
index 2b1e10df..177574cb 100644
--- a/app/Services/Logic/Article/RelatedArticleList.php
+++ b/app/Services/Logic/Article/RelatedArticleList.php
@@ -18,21 +18,33 @@ class RelatedArticleList extends LogicService
 
     public function handle($id)
     {
+        $limit = $this->request->getQuery('limit', 'int', 5);
+
         $article = $this->checkArticle($id);
 
         if (empty($article->tags)) return [];
 
         $tagIds = kg_array_column($article->tags, 'id');
 
-        $randKey = array_rand($tagIds);
-
-        $tagId = $tagIds[$randKey];
+        $tagId = kg_array_rand($tagIds);
 
         $cache = new TaggedArticleListCache();
 
-        $result = $cache->get($tagId);
+        $articles = $cache->get($tagId);
 
-        return $result ?: [];
+        if (empty($articles)) return [];
+
+        foreach ($articles as $key => $article) {
+            if ($article['id'] == $id) {
+                unset($articles[$key]);
+            }
+        }
+
+        if ($limit < count($articles)) {
+            $articles = array_slice($articles, $limit);
+        }
+
+        return $articles;
     }
 
 }
diff --git a/app/Services/Logic/Question/RelatedQuestionList.php b/app/Services/Logic/Question/RelatedQuestionList.php
index 67c9855b..61d81a99 100644
--- a/app/Services/Logic/Question/RelatedQuestionList.php
+++ b/app/Services/Logic/Question/RelatedQuestionList.php
@@ -18,21 +18,33 @@ class RelatedQuestionList extends LogicService
 
     public function handle($id)
     {
+        $limit = $this->request->getQuery('limit', 'int', 5);
+
         $question = $this->checkQuestion($id);
 
         if (empty($question->tags)) return [];
 
         $tagIds = kg_array_column($question->tags, 'id');
 
-        $randKey = array_rand($tagIds);
-
-        $tagId = $tagIds[$randKey];
+        $tagId = kg_array_rand($tagIds);
 
         $cache = new TaggedQuestionListCache();
 
-        $result = $cache->get($tagId);
+        $questions = $cache->get($tagId);
 
-        return $result ?: [];
+        if (empty($questions)) return [];
+
+        foreach ($questions as $key => $question) {
+            if ($question['id'] == $id) {
+                unset($questions[$key]);
+            }
+        }
+
+        if ($limit < count($questions)) {
+            $questions = array_slice($questions, $limit);
+        }
+
+        return $questions;
     }
 
 }