diff --git a/app/Http/Controllers/LikeController.php b/app/Http/Controllers/LikeController.php
index 0f17234ec..46d35dabe 100644
--- a/app/Http/Controllers/LikeController.php
+++ b/app/Http/Controllers/LikeController.php
@@ -30,7 +30,7 @@ class LikeController extends Controller
     public function store(Request $request, $postId)
     {
         $post = Post::findOrFail($postId);
-        $postUrl = "forums/topic/{$post->topic->id}?page={$post->getPageNumber()}#post-{$postId}";
+        $postUrl = "forums/topics/{$post->topic->id}?page={$post->getPageNumber()}#post-{$postId}";
 
         $user = $request->user();
         $like = $user->likes()->where('post_id', '=', $post->id)->where('like', '=', 1)->first();
@@ -65,7 +65,7 @@ class LikeController extends Controller
     public function destroy(Request $request, $postId)
     {
         $post = Post::findOrFail($postId);
-        $postUrl = "forums/topic/{$post->topic->id}?page={$post->getPageNumber()}#post-{$postId}";
+        $postUrl = "forums/topics/{$post->topic->id}?page={$post->getPageNumber()}#post-{$postId}";
 
         $user = $request->user();
         $like = $user->likes()->where('post_id', '=', $post->id)->where('like', '=', 1)->first();
diff --git a/app/Http/Controllers/PostController.php b/app/Http/Controllers/PostController.php
index 7c5db7e97..d274fafb9 100644
--- a/app/Http/Controllers/PostController.php
+++ b/app/Http/Controllers/PostController.php
@@ -15,6 +15,8 @@ namespace App\Http\Controllers;
 
 use App\Models\Post;
 use App\Models\Topic;
+use App\Repositories\ChatRepository;
+use App\Repositories\TaggedUserRepository;
 use Illuminate\Http\Request;
 use App\Achievements\UserMade25Posts;
 use App\Achievements\UserMade50Posts;
@@ -31,6 +33,28 @@ use App\Achievements\UserMadeFirstPost;
 
 class PostController extends Controller
 {
+    /**
+     * @var TaggedUserRepository
+     */
+    private $tag;
+
+    /**
+     * @var ChatRepository
+     */
+    private $chat;
+
+    /**
+     * ForumController Constructor.
+     *
+     * @param TaggedUserRepository $tag
+     * @param ChatRepository       $chat
+     */
+    public function __construct(TaggedUserRepository $tag, ChatRepository $chat)
+    {
+        $this->tag = $tag;
+        $this->chat = $chat;
+    }
+
     /**
      * Add A Post To A Topic.
      *
@@ -70,7 +94,7 @@ class PostController extends Controller
             $post->save();
 
             $appurl = config('app.url');
-            $href = "{$appurl}/forums/topic/{$topic->slug}.{$topic->id}?page={$post->getPageNumber()}#post-{$post->id}";
+            $href = "{$appurl}/forums/topics/{$topic->id}?page={$post->getPageNumber()}#post-{$post->id}";
             $message = "{$user->username} has tagged you in a forum post. You can view it [url=$href] HERE [/url]";
 
             if ($this->tag->hasTags($request->input('content'))) {
@@ -131,8 +155,8 @@ class PostController extends Controller
 
             // Post To Chatbox
             $appurl = config('app.url');
-            $postUrl = "{$appurl}/forums/topic/{$topic->slug}.{$topic->id}?page={$post->getPageNumber()}#post-{$post->id}";
-            $realUrl = "/forums/topic/{$topic->slug}.{$topic->id}?page={$post->getPageNumber()}#post-{$post->id}";
+            $postUrl = "{$appurl}/forums/topics/{$topic->id}?page={$post->getPageNumber()}#post-{$post->id}";
+            $realUrl = "/forums/topics/{$topic->id}?page={$post->getPageNumber()}#post-{$post->id}";
             $profileUrl = "{$appurl}/{$user->username}.{$user->id}";
             $this->chat->systemMessage("[url=$profileUrl]{$user->username}[/url] has left a reply on topic [url={$postUrl}]{$topic->name}[/url]");
 
@@ -196,7 +220,7 @@ class PostController extends Controller
     {
         $user = $request->user();
         $post = Post::findOrFail($postId);
-        $postUrl = "forums/topic/{$post->topic->slug}.{$post->topic->id}?page={$post->getPageNumber()}#post-{$postId}";
+        $postUrl = "forums/topics/{$post->topic->id}?page={$post->getPageNumber()}#post-{$postId}";
 
         abort_unless($user->group->is_modo || $user->id === $post->user_id, 403);
         $post->content = $request->input('content');
diff --git a/app/Http/Controllers/Staff/MassActionController.php b/app/Http/Controllers/Staff/MassActionController.php
index d8f28da41..72b9e36f6 100644
--- a/app/Http/Controllers/Staff/MassActionController.php
+++ b/app/Http/Controllers/Staff/MassActionController.php
@@ -12,39 +12,15 @@
  */
 
 namespace App\Http\Controllers\Staff;
-
-use App\Jobs\ProcessMassPM;
+;
 use App\Models\User;
 use App\Models\Group;
+use App\Jobs\ProcessMassPM;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 
 class MassActionController extends Controller
 {
-    /**
-     * Mass Validate Unvalidated Users.
-     *
-     * @return Illuminate\Http\RedirectResponse
-     */
-    public function validate()
-    {
-        $validatingGroup = Group::select(['id'])->where('slug', '=', 'validating')->first();
-        $memberGroup = Group::select(['id'])->where('slug', '=', 'user')->first();
-        $users = User::where('active', '=', 0)->where('group_id', '=', $validatingGroup->id)->get();
-
-        foreach ($users as $user) {
-            $user->group_id = $memberGroup->id;
-            $user->active = 1;
-            $user->can_upload = 1;
-            $user->can_download = 1;
-            $user->can_request = 1;
-            $user->can_comment = 1;
-            $user->can_invite = 1;
-            $user->save();
-        }
-
-        return redirect()->route('staff.dashboard.index')
-            ->withSuccess('Unvalidated Accounts Are Now Validated');
-    }
-
     /**
      * Mass PM Form.
      *
@@ -91,4 +67,30 @@ class MassActionController extends Controller
                 ->withSuccess('MassPM Sent');
         }
     }
+
+    /**
+     * Mass Validate Unvalidated Users.
+     *
+     * @return Illuminate\Http\RedirectResponse
+     */
+    public function update()
+    {
+        $validatingGroup = Group::select(['id'])->where('slug', '=', 'validating')->first();
+        $memberGroup = Group::select(['id'])->where('slug', '=', 'user')->first();
+        $users = User::where('active', '=', 0)->where('group_id', '=', $validatingGroup->id)->get();
+
+        foreach ($users as $user) {
+            $user->group_id = $memberGroup->id;
+            $user->active = 1;
+            $user->can_upload = 1;
+            $user->can_download = 1;
+            $user->can_request = 1;
+            $user->can_comment = 1;
+            $user->can_invite = 1;
+            $user->save();
+        }
+
+        return redirect()->route('staff.dashboard.index')
+            ->withSuccess('Unvalidated Accounts Are Now Validated');
+    }
 }
diff --git a/app/Http/Controllers/TopicController.php b/app/Http/Controllers/TopicController.php
index ccdbf8708..1a8a8a459 100644
--- a/app/Http/Controllers/TopicController.php
+++ b/app/Http/Controllers/TopicController.php
@@ -16,6 +16,8 @@ namespace App\Http\Controllers;
 use App\Models\Post;
 use App\Models\Forum;
 use App\Models\Topic;
+use App\Repositories\ChatRepository;
+use App\Repositories\TaggedUserRepository;
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
 use App\Achievements\UserMade25Posts;
@@ -33,6 +35,28 @@ use App\Achievements\UserMadeFirstPost;
 
 class TopicController extends Controller
 {
+    /**
+     * @var TaggedUserRepository
+     */
+    private $tag;
+
+    /**
+     * @var ChatRepository
+     */
+    private $chat;
+
+    /**
+     * ForumController Constructor.
+     *
+     * @param TaggedUserRepository $tag
+     * @param ChatRepository       $chat
+     */
+    public function __construct(TaggedUserRepository $tag, ChatRepository $chat)
+    {
+        $this->tag = $tag;
+        $this->chat = $chat;
+    }
+
     /**
      * Show The Topic.
      *
@@ -40,7 +64,7 @@ class TopicController extends Controller
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
-    public function topic($id)
+    public function topic($id, $page = '', $post = '')
     {
         // Find the topic
         $topic = Topic::findOrFail($id);
@@ -186,7 +210,7 @@ class TopicController extends Controller
 
                 // Post To ShoutBox
                 $appurl = config('app.url');
-                $topicUrl = "{$appurl}/forums/topic/{$topic->slug}.{$topic->id}";
+                $topicUrl = "{$appurl}/forums/topics/{$topic->id}";
                 $profileUrl = "{$appurl}/{$user->username}.{$user->id}";
 
                 $this->chat->systemMessage("[url={$profileUrl}]{$user->username}[/url] has created a new topic [url={$topicUrl}]{$topic->name}[/url]");
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 627eb0e18..ae71a8d5c 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -307,7 +307,7 @@ class UserController extends Controller
         $user->twostep = $request->input('twostep');
         $user->save();
 
-        return redirect()->route('user_profile', ['username' => $user->username])
+        return redirect()->route('users.show', ['username' => $user->username])
             ->withSuccess('You Changed Your TwoStep Auth Status!');
     }
 
@@ -409,7 +409,7 @@ class UserController extends Controller
         $user->private_profile = 1;
         $user->save();
 
-        return redirect()->route('user_profile', ['username' => $user->username])
+        return redirect()->route('users.show', ['username' => $user->username])
             ->withSuccess('You Have Gone Private!');
     }
 
@@ -430,7 +430,7 @@ class UserController extends Controller
         $user->private_profile = 0;
         $user->save();
 
-        return redirect()->route('user_profile', ['username' => $user->username])
+        return redirect()->route('users.show', ['username' => $user->username])
             ->withSuccess('You Have Gone Public!');
     }
 
@@ -451,7 +451,7 @@ class UserController extends Controller
         $user->block_notifications = 1;
         $user->save();
 
-        return redirect()->route('user_profile', ['username' => $user->username])
+        return redirect()->route('users.show', ['username' => $user->username])
             ->withSuccess('You Have Disabled Notifications!');
     }
 
@@ -472,7 +472,7 @@ class UserController extends Controller
         $user->block_notifications = 0;
         $user->save();
 
-        return redirect()->route('user_profile', ['username' => $user->username])
+        return redirect()->route('users.show', ['username' => $user->username])
             ->withSuccess('You Have Enabled Notifications!');
     }
 
@@ -493,7 +493,7 @@ class UserController extends Controller
         $user->hidden = 1;
         $user->save();
 
-        return redirect()->route('user_profile', ['username' => $user->username])
+        return redirect()->route('users.show', ['username' => $user->username])
             ->withSuccess('You Have Disappeared Like A Ninja!');
     }
 
@@ -514,7 +514,7 @@ class UserController extends Controller
         $user->hidden = 0;
         $user->save();
 
-        return redirect()->route('user_profile', ['username' => $user->username])
+        return redirect()->route('users.show', ['username' => $user->username])
             ->withSuccess('You Have Given Up Your Ninja Ways And Become Visible!');
     }
 
diff --git a/app/Notifications/NewBon.php b/app/Notifications/NewBon.php
index 332fe7c1d..6671ed63e 100644
--- a/app/Notifications/NewBon.php
+++ b/app/Notifications/NewBon.php
@@ -68,7 +68,7 @@ class NewBon extends Notification implements ShouldQueue
         return [
             'title' => $this->sender.' Has Gifted You '.$this->transaction->cost.' BON',
             'body'  => $this->sender.' has gifted you '.$this->transaction->cost.' BON with the following note: '.$this->transaction->comment,
-            'url'   => "/{$this->transaction->senderObj->username}.{$this->transaction->senderObj->id}",
+            'url'   => "/users/{$this->transaction->senderObj->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewComment.php b/app/Notifications/NewComment.php
index 290594166..b0720302d 100644
--- a/app/Notifications/NewComment.php
+++ b/app/Notifications/NewComment.php
@@ -64,13 +64,13 @@ class NewComment extends Notification
                 return [
                     'title' => 'New Torrent Comment Received',
                     'body' => $this->comment->user->username.' has left you a comment on Torrent '.$this->comment->torrent->name,
-                    'url' => '/torrents/'.$this->comment->torrent->slug.'.'.$this->comment->torrent->id,
+                    'url' => '/torrents/'.$this->comment->torrent->id,
                 ];
             } else {
                 return [
                     'title' => 'New Torrent Comment Received',
                     'body' => 'Anonymous has left you a comment on Torrent '.$this->comment->torrent->name,
-                    'url' => '/torrents/'.$this->comment->torrent->slug.'.'.$this->comment->torrent->id,
+                    'url' => '/torrents/'.$this->comment->torrent->id,
                 ];
             }
         }
@@ -78,13 +78,13 @@ class NewComment extends Notification
             return [
                 'title' => 'New Request Comment Received',
                 'body'  => $this->comment->user->username.' has left you a comment on Torrent Request '.$this->comment->request->name,
-                'url'   => '/request/'.$this->comment->request->id,
+                'url'   => '/requests/'.$this->comment->request->id,
             ];
         } else {
             return [
                 'title' => 'New Request Comment Received',
                 'body'  => 'Anonymous has left you a comment on Torrent Request '.$this->comment->request->name,
-                'url'   => '/request/'.$this->comment->request->id,
+                'url'   => '/requests/'.$this->comment->request->id,
             ];
         }
     }
diff --git a/app/Notifications/NewCommentTag.php b/app/Notifications/NewCommentTag.php
index d78d924b7..30282598c 100644
--- a/app/Notifications/NewCommentTag.php
+++ b/app/Notifications/NewCommentTag.php
@@ -69,20 +69,20 @@ class NewCommentTag extends Notification implements ShouldQueue
             return [
                 'title' => $this->tagger.' Has Tagged You In A Torrent Comment',
                 'body' => $this->tagger.' has tagged you in a Comment for Torrent '.$this->comment->torrent->name,
-                'url' => "/torrents/{$this->comment->torrent->slug}.{$this->comment->torrent->id}",
+                'url' => "/torrents/{$this->comment->torrent->id}",
             ];
         } elseif ($this->type == 'request') {
             return [
                 'title' => $this->tagger.' Has Tagged You In A Request Comment',
                 'body' => $this->tagger.' has tagged you in a Comment for Request '.$this->comment->request->name,
-                'url' => "/request/{$this->comment->request->id}",
+                'url' => "/requests/{$this->comment->request->id}",
             ];
         }
 
         return [
             'title' => $this->tagger.' Has Tagged You In An Article Comment',
             'body' => $this->tagger.' has tagged you in a Comment for Article '.$this->comment->article->title,
-            'url' => "/articles/{$this->comment->article->slug}.{$this->comment->article->id}",
+            'url' => "/articles/{$this->comment->article->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewFollow.php b/app/Notifications/NewFollow.php
index daf325a30..8987de910 100644
--- a/app/Notifications/NewFollow.php
+++ b/app/Notifications/NewFollow.php
@@ -73,7 +73,7 @@ class NewFollow extends Notification implements ShouldQueue
         return [
             'title' => $this->sender->username.' Has Followed You!',
             'body'  => $this->sender->username.' has started to follow you so they will get notifications about your activities.',
-            'url'   => "/{$this->sender->slug}.{$this->sender->id}",
+            'url'   => "/users/{$this->sender->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewPost.php b/app/Notifications/NewPost.php
index 4db9d1bf6..5cbb7e910 100644
--- a/app/Notifications/NewPost.php
+++ b/app/Notifications/NewPost.php
@@ -71,13 +71,13 @@ class NewPost extends Notification implements ShouldQueue
             return [
                 'title' => $this->poster->username.' Has Posted In A Subscribed Topic',
                 'body' => $this->poster->username.' has left a new post in Subscribed Topic '.$this->post->topic->name,
-                'url' => "/forums/topic/{$this->post->topic->slug}.{$this->post->topic->id}?page={$this->post->getPageNumber()}#post-{$this->post->id}",
+                'url' => "/forums/topics/{$this->post->topic->id}?page={$this->post->getPageNumber()}#post-{$this->post->id}",
             ];
         } else {
             return [
                 'title' => $this->poster->username.' Has Posted In A Topic You Started',
                 'body' => $this->poster->username.' has left a new post in Your Topic '.$this->post->topic->name,
-                'url' => "/forums/topic/{$this->post->topic->slug}.{$this->post->topic->id}?page={$this->post->getPageNumber()}#post-{$this->post->id}",
+                'url' => "/forums/topics/{$this->post->topic->id}?page={$this->post->getPageNumber()}#post-{$this->post->id}",
             ];
         }
     }
diff --git a/app/Notifications/NewPostTag.php b/app/Notifications/NewPostTag.php
index 76bfe0da0..88f49be67 100644
--- a/app/Notifications/NewPostTag.php
+++ b/app/Notifications/NewPostTag.php
@@ -68,7 +68,7 @@ class NewPostTag extends Notification implements ShouldQueue
         return [
             'title' => $this->tagger.' Has Tagged You In A Post',
             'body'  => $this->tagger.' has tagged you in a Post in Topic '.$this->post->topic->name,
-            'url'   => "/forums/topic/{$this->post->topic->slug}.{$this->post->topic->id}?page={$this->post->getPageNumber()}#post-{$this->post->id}",
+            'url'   => "/forums/topics/{$this->post->topic->id}?page={$this->post->getPageNumber()}#post-{$this->post->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewPostTip.php b/app/Notifications/NewPostTip.php
index b1cfdf444..392bf3f21 100644
--- a/app/Notifications/NewPostTip.php
+++ b/app/Notifications/NewPostTip.php
@@ -72,7 +72,7 @@ class NewPostTip extends Notification implements ShouldQueue
         return [
             'title' => $this->tipper.' Has Tipped You '.$this->amount.' BON For A Forum Post',
             'body'  => $this->tipper.' has tipped one of your Forum posts in '.$this->post->topic->name,
-            'url'   => "/forums/topic/{$this->post->topic->slug}.{$this->post->topic->id}?page={$this->post->getPageNumber()}#post-{$this->post->id}",
+            'url'   => "/forums/topics/{$this->post->topic->id}?page={$this->post->getPageNumber()}#post-{$this->post->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewRequestBounty.php b/app/Notifications/NewRequestBounty.php
index e4a407bc5..424d1a26b 100644
--- a/app/Notifications/NewRequestBounty.php
+++ b/app/Notifications/NewRequestBounty.php
@@ -72,7 +72,7 @@ class NewRequestBounty extends Notification implements ShouldQueue
         return [
             'title' => $this->sender.' Has Added A Bounty Of '.$this->amount.' To A Requested Torrent',
             'body'  => $this->sender.' has added a bounty to one of your Requested Torrents '.$this->tr->name,
-            'url'   => "/request/{$this->tr->id}",
+            'url'   => "/requests/{$this->tr->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewRequestClaim.php b/app/Notifications/NewRequestClaim.php
index 1e5806df6..95c7e8c32 100644
--- a/app/Notifications/NewRequestClaim.php
+++ b/app/Notifications/NewRequestClaim.php
@@ -68,7 +68,7 @@ class NewRequestClaim extends Notification implements ShouldQueue
         return [
             'title' => $this->sender.' Has Claimed One Of Your Requested Torrents',
             'body'  => $this->sender.' has claimed your Requested Torrent '.$this->tr->name,
-            'url'   => "/request/{$this->tr->id}",
+            'url'   => "/requests/{$this->tr->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewRequestFill.php b/app/Notifications/NewRequestFill.php
index 932e142f1..ebd177dd8 100644
--- a/app/Notifications/NewRequestFill.php
+++ b/app/Notifications/NewRequestFill.php
@@ -68,7 +68,7 @@ class NewRequestFill extends Notification implements ShouldQueue
         return [
             'title' => $this->sender.' Has Filled One Of Your Torrent Requests',
             'body'  => $this->sender.' has filled one of your Requested Torrents '.$this->tr->name,
-            'url'   => "/request/{$this->tr->id}",
+            'url'   => "/requests/{$this->tr->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewRequestFillApprove.php b/app/Notifications/NewRequestFillApprove.php
index 360b5080d..47b2bb087 100644
--- a/app/Notifications/NewRequestFillApprove.php
+++ b/app/Notifications/NewRequestFillApprove.php
@@ -68,7 +68,7 @@ class NewRequestFillApprove extends Notification implements ShouldQueue
         return [
             'title' => $this->sender.' Has Approved Your Fill Of A Requested Torrent',
             'body'  => $this->sender.' has approved your fill of Requested Torrent '.$this->tr->name,
-            'url'   => "/request/{$this->tr->id}",
+            'url'   => "/requests/{$this->tr->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewRequestFillReject.php b/app/Notifications/NewRequestFillReject.php
index 6034aed11..15878b561 100644
--- a/app/Notifications/NewRequestFillReject.php
+++ b/app/Notifications/NewRequestFillReject.php
@@ -68,7 +68,7 @@ class NewRequestFillReject extends Notification implements ShouldQueue
         return [
             'title' => $this->sender.' Has Rejected Your Fill Of A Requested Torrent',
             'body'  => $this->sender.' has rejected your fill of Requested Torrent '.$this->tr->name,
-            'url'   => "/request/{$this->tr->id}",
+            'url'   => "/requests/{$this->tr->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewRequestUnclaim.php b/app/Notifications/NewRequestUnclaim.php
index d91ca0af7..439b2ac82 100644
--- a/app/Notifications/NewRequestUnclaim.php
+++ b/app/Notifications/NewRequestUnclaim.php
@@ -68,7 +68,7 @@ class NewRequestUnclaim extends Notification implements ShouldQueue
         return [
             'title' => $this->sender.' Has Unclaimed One Of Your Requested Torrents',
             'body'  => $this->sender.' has unclaimed your Requested Torrent '.$this->tr->name,
-            'url'   => "/request/{$this->tr->id}",
+            'url'   => "/requests/{$this->tr->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewReseedRequest.php b/app/Notifications/NewReseedRequest.php
index ff080f680..ba79186df 100644
--- a/app/Notifications/NewReseedRequest.php
+++ b/app/Notifications/NewReseedRequest.php
@@ -60,7 +60,7 @@ class NewReseedRequest extends Notification implements ShouldQueue
         return [
             'title' => 'New Reseed Request',
             'body'  => "Some time ago, you downloaded: {$this->torrent->name}. Now its dead and someone has requested a reseed on it. If you still have this torrent in storage, please consider reseeding it!",
-            'url'   => "{$appurl}/torrents/{$this->torrent->slug}.{$this->torrent->id}",
+            'url'   => "{$appurl}/torrents/{$this->torrent->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewThank.php b/app/Notifications/NewThank.php
index 0106aae60..c42ff818b 100644
--- a/app/Notifications/NewThank.php
+++ b/app/Notifications/NewThank.php
@@ -63,7 +63,7 @@ class NewThank extends Notification
         return [
             'title' => $this->thank->user->username.' Has Thanked You For An Uploaded Torrent',
             'body' => $this->thank->user->username.' has left you a thanks on Uploaded Torrent '.$this->thank->torrent->name,
-            'url' => '/torrents/'.$this->thank->torrent->slug.'.'.$this->thank->torrent->id,
+            'url' => '/torrents/'.$this->thank->torrent->id,
         ];
     }
 }
diff --git a/app/Notifications/NewTopic.php b/app/Notifications/NewTopic.php
index bfb4f24ae..c1334bcf1 100644
--- a/app/Notifications/NewTopic.php
+++ b/app/Notifications/NewTopic.php
@@ -69,7 +69,7 @@ class NewTopic extends Notification implements ShouldQueue
         return [
             'title' => $this->poster->username.' Has Posted In A Subscribed Forum',
             'body' => $this->poster->username.' has started a new topic in '.$this->topic->forum->name,
-            'url' => "/forums/topic/{$this->topic->slug}.{$this->topic->id}",
+            'url' => "/forums/topics/{$this->topic->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewUnfollow.php b/app/Notifications/NewUnfollow.php
index 9ec4cf762..23563538c 100644
--- a/app/Notifications/NewUnfollow.php
+++ b/app/Notifications/NewUnfollow.php
@@ -68,7 +68,7 @@ class NewUnfollow extends Notification implements ShouldQueue
         return [
             'title' => $this->sender->username.' Has Unfollowed You!',
             'body'  => $this->sender->username.' has stopped following you so they will no longer get notifications about your activities.',
-            'url'   => '/'.$this->sender->slug.'.'.$this->sender->id,
+            'url'   => '/users/'.$this->sender->id,
         ];
     }
 }
diff --git a/app/Notifications/NewUpload.php b/app/Notifications/NewUpload.php
index be4e34ecd..17ef1c05f 100644
--- a/app/Notifications/NewUpload.php
+++ b/app/Notifications/NewUpload.php
@@ -66,7 +66,7 @@ class NewUpload extends Notification implements ShouldQueue
         return [
             'title' => $this->torrent->user->username.' Has Uploaded A New Torrent',
             'body'  => "{$this->torrent->user->username}, whom you are following has uploaded Torrent {$this->torrent->name}",
-            'url'   => "/torrents/{$this->torrent->slug}.{$this->torrent->id}",
+            'url'   => "/torrents/{$this->torrent->id}",
         ];
     }
 }
diff --git a/app/Notifications/NewUploadTip.php b/app/Notifications/NewUploadTip.php
index 60e234b11..f045a885d 100644
--- a/app/Notifications/NewUploadTip.php
+++ b/app/Notifications/NewUploadTip.php
@@ -72,7 +72,7 @@ class NewUploadTip extends Notification implements ShouldQueue
         return [
             'title' => $this->tipper.' Has Tipped You '.$this->amount.' BON For An Uploaded Torrent',
             'body'  => $this->tipper.' has tipped one of your Uploaded Torrents '.$this->torrent->name,
-            'url'   => "/torrents/{$this->torrent->slug}.{$this->torrent->id}",
+            'url'   => "/torrents/{$this->torrent->id}",
         ];
     }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index cc3539534..30a0f3bbf 100755
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -38,7 +38,7 @@ class AppServiceProvider extends ServiceProvider
         // Share $pages across all views
         view()->composer('*', function (View $view) {
             $pages = cache()->remember('cached-pages', 3600, function () {
-                return Page::select(['id', 'name', 'slug'])->take(6)->get();
+                return Page::select(['id', 'name', 'slug', 'created_at'])->take(6)->get();
             });
 
             $view->with(compact('pages'));
diff --git a/database/migrations/2017_12_10_020753_create_users_table.php b/database/migrations/2017_12_10_020753_create_users_table.php
index 994bd3da7..9e92401e1 100644
--- a/database/migrations/2017_12_10_020753_create_users_table.php
+++ b/database/migrations/2017_12_10_020753_create_users_table.php
@@ -40,7 +40,7 @@ class CreateUsersTable extends Migration
             $table->float('seedbonus', 12)->unsigned()->default(0.00);
             $table->integer('invites')->unsigned()->default(0);
             $table->integer('hitandruns')->unsigned()->default(0);
-            $table->string('rsskey')->default('abcdefg');
+            $table->string('rsskey');
             $table->boolean('hidden')->default(0);
             $table->boolean('style')->default(0);
             $table->boolean('nav')->default(0);
diff --git a/database/seeds/PagesTableSeeder.php b/database/seeds/PagesTableSeeder.php
index 9dca9fca1..849958dbd 100644
--- a/database/seeds/PagesTableSeeder.php
+++ b/database/seeds/PagesTableSeeder.php
@@ -10,6 +10,8 @@
  * @license    https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
  * @author     HDVinnie
  */
+
+use App\Models\Page;
 use Illuminate\Database\Seeder;
 
 class PagesTableSeeder extends Seeder
@@ -21,54 +23,46 @@ class PagesTableSeeder extends Seeder
      */
     public function run()
     {
-        \DB::table('pages')->delete();
+        Page::create([
+            'id' => 1,
+            'name' => 'Rules',
+            'slug' => 'rules',
+            'content' => 'RULES GOES HERE',
+        ]);
 
-        \DB::table('pages')->insert([
-            0 => [
-                    'id'         => 1,
-                    'name'       => 'Rules',
-                    'slug'       => 'rules',
-                    'content'    => 'RULES GOES HERE',
-                    'created_at' => '2016-12-20 22:09:45',
-                    'updated_at' => '2017-12-01 13:39:43',
-                ],
-                1 => [
-                    'id'         => 3,
-                    'name'       => 'FAQ',
-                    'slug'       => 'faq',
-                    'content'    => 'FAQ GOES HERE',
-                    'created_at' => '2017-10-28 21:26:15',
-                    'updated_at' => '2017-10-28 21:26:15',
-                ],
-                2 => [
-                    'id'         => 4,
-                    'name'       => 'Suggested Clients',
-                    'slug'       => 'suggested-clients',
-                    'content'    => 'We suggest the following BitTorrent clients.',
-                    'created_at' => '2017-01-27 15:52:01',
-                    'updated_at' => '2017-08-07 17:30:56',
-                ],
-                3 => [
-                    'id'         => 5,
-                    'name'       => 'Upload Guide',
-                    'slug'       => 'upload-guide',
-                    'content'    => 'UPLOAD GUIDE HERE',
-                    'created_at' => '2017-04-24 14:45:03',
-                    'updated_at' => '2017-08-07 17:34:42',
-                ],
-                4 => [
-                    'id'         => 6,
-                    'name'       => 'Tracker Codes',
-                    'slug'       => 'tracker-codes',
-                    'content'    => 'Our Tracker Codes/Responses',
-                    'created_at' => '2017-09-08 14:23:16',
-                    'updated_at' => '2017-09-08 14:27:12',
-                ],
-                5 => [
-                    'id'      => 7,
-                    'name'    => 'Terms Of Use',
-                    'slug'    => 'terms-of-use',
-                    'content' => '*All references to "we", "us" or "our" refer to the site owner(s).
+        Page::create([
+            'id' => 2,
+            'name' => 'FAQ',
+            'slug' => 'faq',
+            'content' => 'FAQ GOES HERE',
+        ]);
+
+        Page::create([
+            'id' => 3,
+            'name' => 'Suggested Clients',
+            'slug' => 'suggested-clients',
+            'content' => 'We suggest the following BitTorrent clients.',
+        ]);
+
+        Page::create([
+            'id' => 4,
+            'name' => 'Upload Guide',
+            'slug' => 'upload-guide',
+            'content' => 'UPLOAD GUIDE HERE',
+        ]);
+
+        Page::create([
+            'id' => 5,
+            'name' => 'Tracker Codes',
+            'slug' => 'tracker-codes',
+            'content' => 'Our Tracker Codes/Responses',
+        ]);
+
+        Page::create([
+            'id' => 6,
+            'name' => 'Terms Of Use',
+            'slug' => 'terms-of-use',
+            'content' => '*All references to "we", "us" or "our" refer to the site owner(s).
 
 Welcome to our website located at '.config('app.url').' (this "Site")! This Site allows you to:
 (a) participate in interactive features that we may make available from time to time through the Site; or
@@ -147,9 +141,6 @@ YOU AGREE THAT YOUR USE OF THIS SITE AND SERVICES WILL BE AT YOUR SOLE RISK. WE
 (D) ANY INTERRUPTION OR CESSATION OF TRANSMISSION TO OR FROM THIS SITE,
 (E) ANY BUGS, VIRUSES, TROJAN HORSES, OR THE LIKE, WHICH MAY BE TRANSMITTED TO OR THROUGH THIS SITE BY ANY THIRD PARTY, AND/OR
 (F) ANY ERRORS OR OMISSIONS IN ANY CONTRIBUTIONS, CONTENT AND MATERIALS OR FOR ANY LOSS OR DAMAGE OF ANY KIND INCURRED AS A RESULT OF THE USE OF ANY CONTENT, CONTRIBUTIONS, OR MATERIALS POSTED, TRANSMITTED, OR OTHERWISE MADE AVAILABLE VIA THIS SITE.WE WILL NOT BE LIABLE TO YOU FOR ANY LOSS OF ANY DATA (INCLUDING CONTENT) OR FOR LOSS OF USE OF THIS SITE.SOME STATES OR JURISDICTIONS DO NOT ALLOW THE LIMITATION OR EXCLUSION OF CERTAIN WARRANTIES, OR THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES. IF YOU RESIDE IN ONE OF THESE STATES OR JURISDICTIONS, THE ABOVE LIMITATIONS OR EXCLUSIONS MAY NOT APPLY TO YOU.',
-                    'created_at' => '2017-10-03 14:50:15',
-                    'updated_at' => '2017-10-03 18:31:25',
-                ],
         ]);
     }
 }
diff --git a/resources/views/Staff/application/show.blade.php b/resources/views/Staff/application/show.blade.php
index 4afbf0133..e15569a2b 100644
--- a/resources/views/Staff/application/show.blade.php
+++ b/resources/views/Staff/application/show.blade.php
@@ -65,7 +65,7 @@
                             @foreach($application->imageProofs as $key => $img_proof)
                                 <button id="show-img" type="button" class="btn btn-sm btn-info" data-toggle="modal" data-target="#image-{{ $img_proof->id }}">Profile Image {{ ++$key }}</button>
                                 <div id="image-{{ $img_proof->id }}" class="modal fade" aria-labelledby="my-modalLabel" aria-hidden="true" tabindex="-1" role="dialog">
-                                    <div class="modal-dialog" data-dismiss="modal">
+                                    <div class="modal-dialog modal-dark" data-dismiss="modal">
                                         <div class="modal-content"  >
                                             <div class="modal-body">
                                                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
@@ -131,7 +131,7 @@
                             <div id="approve-application" class="modal fade" role="dialog">
                                 <form method="POST" action="{{ route('staff.applications.approve', ['id' => $application->id]) }}">
                                 @csrf
-                                <div class="modal-dialog">
+                                <div class="modal-dialog modal-dark">
                                     <div class="modal-content">
                                         <div class="modal-header">
                                             <button type="button" class="close" data-dismiss="modal">&times;</button>
@@ -161,7 +161,7 @@
                             <div id="deny-application" class="modal fade" role="dialog">
                                 <form method="POST" action="{{ route('staff.applications.reject', ['id' => $application->id]) }}">
                                 @csrf
-                                <div class="modal-dialog">
+                                <div class="modal-dialog modal-dark">
                                     <div class="modal-content">
                                         <div class="modal-header">
                                             <button type="button" class="close" data-dismiss="modal">&times;</button>
diff --git a/resources/views/Staff/chat/room/chatroom_modals.blade.php b/resources/views/Staff/chat/room/chatroom_modals.blade.php
index 864d7ea8f..a1112f3b0 100644
--- a/resources/views/Staff/chat/room/chatroom_modals.blade.php
+++ b/resources/views/Staff/chat/room/chatroom_modals.blade.php
@@ -1,6 +1,6 @@
 {{--Edit Chatroom--}}
 <div id="editChatroom-{{ $chatroom->id }}" class="modal fade" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-dark">
         <div class="modal-content">
 
             <div class="modal-header" style="text-align: center;">
@@ -26,7 +26,7 @@
 
 {{--Delete Chatroom--}}
 <div id="deleteChatroom-{{ $chatroom->id }}" class="modal fade" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-dark">
         <div class="modal-content">
 
             <div class="modal-header">
diff --git a/resources/views/Staff/chat/room/index.blade.php b/resources/views/Staff/chat/room/index.blade.php
index 8fb471b67..5756fa8b5 100644
--- a/resources/views/Staff/chat/room/index.blade.php
+++ b/resources/views/Staff/chat/room/index.blade.php
@@ -20,7 +20,7 @@
         <button class="btn btn-primary" data-toggle="modal" data-target="#addChatroom">Add New Chatroom</button>
         {{--Add Chatroom Modal--}}
         <div id="addChatroom" class="modal fade" tabindex="-1" role="dialog">
-            <div class="modal-dialog">
+            <div class="modal-dialog modal-dark">
                 <div class="modal-content">
 
                     <div class="modal-header" style="text-align: center;">
diff --git a/resources/views/Staff/chat/status/chatstatuses_modals.blade.php b/resources/views/Staff/chat/status/chatstatuses_modals.blade.php
index c578e35f1..93bf64ef4 100644
--- a/resources/views/Staff/chat/status/chatstatuses_modals.blade.php
+++ b/resources/views/Staff/chat/status/chatstatuses_modals.blade.php
@@ -1,6 +1,6 @@
 {{--Edit Chatroom--}}
 <div id="editChatStatus-{{ $chatstatus->id }}" class="modal fade" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-dark">
         <div class="modal-content">
 
             <div class="modal-header" style="text-align: center;">
@@ -28,7 +28,7 @@
 
 {{--Delete Chatroom--}}
 <div id="deleteChatStatus-{{ $chatstatus->id }}" class="modal fade" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-dark">
         <div class="modal-content">
 
             <div class="modal-header">
diff --git a/resources/views/Staff/chat/status/index.blade.php b/resources/views/Staff/chat/status/index.blade.php
index ecaf49e62..5edac5b7b 100644
--- a/resources/views/Staff/chat/status/index.blade.php
+++ b/resources/views/Staff/chat/status/index.blade.php
@@ -20,7 +20,7 @@
         <button class="btn btn-primary" data-toggle="modal" data-target="#addChatStatus">Add New Chat Status</button>
         {{--Add Chatroom Modal--}}
         <div id="addChatStatus" class="modal fade" tabindex="-1" role="dialog">
-            <div class="modal-dialog">
+            <div class="modal-dialog modal-dark">
                 <div class="modal-content">
 
                     <div class="modal-header" style="text-align: center;">
diff --git a/resources/views/Staff/moderation/index.blade.php b/resources/views/Staff/moderation/index.blade.php
index 7f1fb893c..2ba104f37 100644
--- a/resources/views/Staff/moderation/index.blade.php
+++ b/resources/views/Staff/moderation/index.blade.php
@@ -63,7 +63,7 @@
                                  aria-hidden="true">
                                 <form method="POST" action="{{ route('staff.moderation.postpone') }}">
                                     @csrf
-                                    <div class="modal-dialog modal-lg">
+                                    <div class="modal-dialog modal-dark">
                                         <div class="modal-content">
                                             <div class="modal-header">
                                                 <button type="button" class="close" data-dismiss="modal"
@@ -110,7 +110,7 @@
                             <div class="modal fade" id="pendreject-{{ $p->id }}" tabindex="-1" role="dialog" aria-hidden="true">
                                 <form method="POST" action="{{ route("staff.moderation.reject") }}">
                                     @csrf
-                                    <div class="modal-dialog modal-lg">
+                                    <div class="modal-dialog modal-dark">
                                         <div class="modal-content">
                                             <div class="modal-header">
                                                 <button type="button" class="close" data-dismiss="modal"
@@ -218,7 +218,7 @@
                                  aria-hidden="true">
                                 <form method="POST" action="{{ route('delete') }}">
                                     @csrf
-                                    <div class="modal-dialog modal-lg">
+                                    <div class="modal-dialog modal-dark">
                                         <div class="modal-content">
                                             <div class="modal-header">
                                                 <button type="button" class="close" data-dismiss="modal"
@@ -324,7 +324,7 @@
                                  aria-hidden="true">
                                 <form method="POST" action="{{ route('staff.moderation.postpone') }}">
                                     @csrf
-                                    <div class="modal-dialog modal-lg">
+                                    <div class="modal-dialog modal-dark">
                                         <div class="modal-content">
                                             <div class="modal-header">
                                                 <button type="button" class="close" data-dismiss="modal"
@@ -375,7 +375,7 @@
                                  aria-hidden="true">
                                 <form method="POST" action=" {{ route('delete') }}">
                                     @csrf
-                                    <div class="modal-dialog modal-lg">
+                                    <div class="modal-dialog modal-dark">
                                         <div class="modal-content">
                                             <div class="modal-header">
                                                 <button type="button" class="close" data-dismiss="modal"
diff --git a/resources/views/Staff/page/index.blade.php b/resources/views/Staff/page/index.blade.php
index 161fee0f8..9e197a3fb 100755
--- a/resources/views/Staff/page/index.blade.php
+++ b/resources/views/Staff/page/index.blade.php
@@ -36,7 +36,7 @@
                                 </a>
                             </td>
                             <td>
-                                {{ date('d M Y', $page->created_at->getTimestamp()) }}
+                                {{ $page->created_at }} ({{ $page->created_at->diffForHumans() }})
                             </td>
                             <td>
                                 <form action="{{ route('staff.pages.destroy', ['id' => $page->id]) }}" method="POST">
diff --git a/resources/views/article/index.blade.php b/resources/views/article/index.blade.php
index 7909d5183..964331bc6 100755
--- a/resources/views/article/index.blade.php
+++ b/resources/views/article/index.blade.php
@@ -1,11 +1,11 @@
 @extends('layout.default')
 
 @section('title')
-    <title>{{ $article->title }} - @lang('articles.articles') - {{ config('other.title') }}</title>
+    <title>@lang('articles.articles') - {{ config('other.title') }}</title>
 @endsection
 
 @section('meta')
-    <meta name="description" content="{{ substr(strip_tags($article->content), 0, 200) }}...">
+    <meta name="description" content="@lang('articles.meta-articles')">
 @endsection
 
 @section('breadcrumb')
@@ -14,128 +14,45 @@
             <span itemprop="title" class="l-breadcrumb-item-link-title">@lang('articles.articles')</span>
         </a>
     </li>
-    <li>
-        <a href="{{ route('articles.show', ['id' => $article->id]) }}" itemprop="url"
-           class="l-breadcrumb-item-link">
-            <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $article->title }}</span>
-        </a>
-    </li>
 @endsection
 
 @section('content')
-    <div class="box container">
-        <a href="{{ route('articles.show', ['id' => $article->id]) }}"
-           style=" float: right; margin-right: 10px;">
-            @if ( ! is_null($article->image))
-                <img src="{{ url('files/img/' . $article->image) }}" alt="{{ $article->title }}">
-            @else
-                <img src="{{ url('img/missing-image.png') }}" alt="{{ $article->title }}">
-            @endif
-        </a>
+    <div class="container box">
+        <div class="header gradient light_blue">
+            <div class="inner_content">
+                <h1>@lang('articles.articles')</h1>
+            </div>
+        </div>
+        @foreach ($articles as $article)
+            <div class="well">
+                <a href="{{ route('articles.show', ['id' => $article->id]) }}"
+                   style=" float: right; margin-right: 10px;">
+                    @if ( ! is_null($article->image))
+                        <img src="{{ url('files/img/' . $article->image) }}" alt="{{ $article->title }}">
+                    @else
+                        <img src="{{ url('img/missing-image.png') }}" alt="{{ $article->title }}">
+                    @endif
+                </a>
 
-        <h1 class="text-bold" style="display: inline ;">{{ $article->title }}</h1>
+                <h1 class="text-bold" style="display: inline ;">{{ $article->title }}</h1>
 
-        <p class="text-muted">
-            <em>@lang('articles.published-at') {{ $article->created_at->toDayDateTimeString() }}</em>
-        </p>
+                <p class="text-muted">
+                    <em>@lang('articles.published-at') {{ $article->created_at->toDayDateTimeString() }}</em>
+                </p>
 
-        <p style="margin-top: 20px;">@emojione($article->getContentHtml())</p>
-    </div>
+                <p style="margin-top: 20px;">
+                    @emojione(preg_replace('#\[[^\]]+\]#', '', Str::limit($article->content), 150))...
+                </p>
 
-    <div class="box container">
-        <div class="clearfix"></div>
-        <div class="row ">
-            <div class="col-md-12">
-                <div class="panel panel-danger">
-                    <div class="panel-heading border-light">
-                        <h4 class="panel-title">
-                            <i class="{{ config('other.font-awesome') }} fa-comment"></i> @lang('common.comments')
-                        </h4>
-                    </div>
-                    <div class="panel-body no-padding">
-                        <ul class="media-list comments-list">
-                            @if (count($article->comments) == 0)
-                                <div class="text-center"><h4 class="text-bold text-danger"><i
-                                                class="{{ config('other.font-awesome') }} fa-frown"></i> @lang('common.no-comments')!</h4>
-                                </div>
-                            @else
-                                @foreach ($article->comments as $comment)
-                                    <li class="media" style="border-left: 5px solid #01bc8c;">
-                                        <div class="media-body">
-                                            @if ($comment->anon == 1)
-                                                <a href="#" class="pull-left" style="padding-right: 10px;">
-                                                    <img src="{{ url('img/profile.png') }}"
-                                                         alt="{{ $comment->user->username }}" class="img-avatar-48">
-                                                    <strong>{{ strtoupper(trans('common.anonymous')) }}</strong></a> @if (auth()->user()->id == $comment->user->id || auth()->user()->group->is_modo)
-                                                    <a href="{{ route('users.show', ['username' => $comment->user->username]) }}" style="color:{{ $comment->user->group->color }};">(<span><i class="{{ $comment->user->group->icon }}"></i> {{ $comment->user->username }}</span>)</a> @endif
-                                            @else
-                                                <a href="{{ route('users.show', ['username' => $comment->user->username]) }}"
-                                                   class="pull-left" style="padding-right: 10px;">
-                                                    @if ($comment->user->image != null)
-                                                        <img src="{{ url('files/img/' . $comment->user->image) }}"
-                                                             alt="{{ $comment->user->username }}" class="img-avatar-48"></a>
-                                                @else
-                                                    <img src="{{ url('img/profile.png') }}"
-                                                         alt="{{ $comment->user->username }}" class="img-avatar-48"></a>
-                                                @endif
-                                                <strong><a
-                                                            href="{{ route('users.show', ['username' => $comment->user->username]) }}" style="color:{{ $comment->user->group->color }};"><span><i class="{{ $comment->user->group->icon }}"></i> {{ $comment->user->username }}</span></a></strong> @endif
-                                            <span class="text-muted"><small><em>{{$comment->created_at->diffForHumans() }}</em></small></span>
-                                            @if ($comment->user_id == auth()->id() || auth()->user()->group->is_modo)
-                                                <a title="@lang('common.delete-your-comment')"
-                                                   href="{{route('comment_delete',['comment_id'=>$comment->id])}}"><i
-                                                            class="pull-right btn btn-danger btn-xs {{ config('other.font-awesome') }} fa fa-times" aria-hidden="true"></i></a>
-                                                <a title="@lang('common.edit-your-comment')" data-toggle="modal"
-                                                   data-target="#modal-comment-edit-{{ $comment->id }}"><i
-                                                            class="pull-right btn btn-warning btn-xs {{ config('other.font-awesome') }} fa-pencil"
-                                                            aria-hidden="true"></i></a>
-                                            @endif
-                                            <div class="pt-5">
-                                                @emojione($comment->getContentHtml())
-                                            </div>
-                                        </div>
-                                    </li>
-                                    @include('partials.modals', ['comment' => $comment])
-                                @endforeach
-                            @endif
-                        </ul>
-                    </div>
+                <div class="text-center">
+                    <a href="{{ route('articles.show', ['id' => $article->id]) }}" class="btn btn-success">
+                        @lang('articles.read-more')
+                    </a>
                 </div>
             </div>
-
-            <br>
-
-            <div class="col-md-12">
-                <form role="form" method="POST" action="{{ route('comment_article', ['id' => $article->id]) }}">
-                    @csrf
-                    <div class="form-group">
-                        <label for="content">@lang('common.your-comment'):</label><span class="badge-extra">@lang('common.type')
-                            <strong>:</strong> @lang('common.for') emoji</span> <span
-                                class="badge-extra">BBCode @lang('common.is-allowed')</span>
-                        <textarea id="content" name="content" cols="30" rows="5" class="form-control"></textarea>
-                    </div>
-                    <button type="submit" class="btn btn-danger">@lang('common.submit')</button>
-                    <label class="radio-inline"><strong>@lang('common.anonymous') @lang('common.comment')
-                            :</strong></label>
-                    <label>
-                        <input type="radio" value="1" name="anonymous">
-                    </label> @lang('common.yes')
-                    <label>
-                        <input type="radio" value="0" checked="checked" name="anonymous">
-                    </label> @lang('common.no')
-                </form>
-            </div>
+        @endforeach
+        <div class="text-center">
+            {{ $articles->links() }}
         </div>
     </div>
 @endsection
-
-@section('javascripts')
-    <script nonce="{{ Bepsvpt\SecureHeaders\SecureHeaders::nonce() }}">
-      $(document).ready(function () {
-
-        $('#content').wysibb({});
-
-        emoji.textcomplete()
-      })
-    </script>
-@endsection
diff --git a/resources/views/article/show.blade.php b/resources/views/article/show.blade.php
index 964331bc6..7909d5183 100755
--- a/resources/views/article/show.blade.php
+++ b/resources/views/article/show.blade.php
@@ -1,11 +1,11 @@
 @extends('layout.default')
 
 @section('title')
-    <title>@lang('articles.articles') - {{ config('other.title') }}</title>
+    <title>{{ $article->title }} - @lang('articles.articles') - {{ config('other.title') }}</title>
 @endsection
 
 @section('meta')
-    <meta name="description" content="@lang('articles.meta-articles')">
+    <meta name="description" content="{{ substr(strip_tags($article->content), 0, 200) }}...">
 @endsection
 
 @section('breadcrumb')
@@ -14,45 +14,128 @@
             <span itemprop="title" class="l-breadcrumb-item-link-title">@lang('articles.articles')</span>
         </a>
     </li>
+    <li>
+        <a href="{{ route('articles.show', ['id' => $article->id]) }}" itemprop="url"
+           class="l-breadcrumb-item-link">
+            <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $article->title }}</span>
+        </a>
+    </li>
 @endsection
 
 @section('content')
-    <div class="container box">
-        <div class="header gradient light_blue">
-            <div class="inner_content">
-                <h1>@lang('articles.articles')</h1>
-            </div>
-        </div>
-        @foreach ($articles as $article)
-            <div class="well">
-                <a href="{{ route('articles.show', ['id' => $article->id]) }}"
-                   style=" float: right; margin-right: 10px;">
-                    @if ( ! is_null($article->image))
-                        <img src="{{ url('files/img/' . $article->image) }}" alt="{{ $article->title }}">
-                    @else
-                        <img src="{{ url('img/missing-image.png') }}" alt="{{ $article->title }}">
-                    @endif
-                </a>
+    <div class="box container">
+        <a href="{{ route('articles.show', ['id' => $article->id]) }}"
+           style=" float: right; margin-right: 10px;">
+            @if ( ! is_null($article->image))
+                <img src="{{ url('files/img/' . $article->image) }}" alt="{{ $article->title }}">
+            @else
+                <img src="{{ url('img/missing-image.png') }}" alt="{{ $article->title }}">
+            @endif
+        </a>
 
-                <h1 class="text-bold" style="display: inline ;">{{ $article->title }}</h1>
+        <h1 class="text-bold" style="display: inline ;">{{ $article->title }}</h1>
 
-                <p class="text-muted">
-                    <em>@lang('articles.published-at') {{ $article->created_at->toDayDateTimeString() }}</em>
-                </p>
+        <p class="text-muted">
+            <em>@lang('articles.published-at') {{ $article->created_at->toDayDateTimeString() }}</em>
+        </p>
 
-                <p style="margin-top: 20px;">
-                    @emojione(preg_replace('#\[[^\]]+\]#', '', Str::limit($article->content), 150))...
-                </p>
+        <p style="margin-top: 20px;">@emojione($article->getContentHtml())</p>
+    </div>
 
-                <div class="text-center">
-                    <a href="{{ route('articles.show', ['id' => $article->id]) }}" class="btn btn-success">
-                        @lang('articles.read-more')
-                    </a>
+    <div class="box container">
+        <div class="clearfix"></div>
+        <div class="row ">
+            <div class="col-md-12">
+                <div class="panel panel-danger">
+                    <div class="panel-heading border-light">
+                        <h4 class="panel-title">
+                            <i class="{{ config('other.font-awesome') }} fa-comment"></i> @lang('common.comments')
+                        </h4>
+                    </div>
+                    <div class="panel-body no-padding">
+                        <ul class="media-list comments-list">
+                            @if (count($article->comments) == 0)
+                                <div class="text-center"><h4 class="text-bold text-danger"><i
+                                                class="{{ config('other.font-awesome') }} fa-frown"></i> @lang('common.no-comments')!</h4>
+                                </div>
+                            @else
+                                @foreach ($article->comments as $comment)
+                                    <li class="media" style="border-left: 5px solid #01bc8c;">
+                                        <div class="media-body">
+                                            @if ($comment->anon == 1)
+                                                <a href="#" class="pull-left" style="padding-right: 10px;">
+                                                    <img src="{{ url('img/profile.png') }}"
+                                                         alt="{{ $comment->user->username }}" class="img-avatar-48">
+                                                    <strong>{{ strtoupper(trans('common.anonymous')) }}</strong></a> @if (auth()->user()->id == $comment->user->id || auth()->user()->group->is_modo)
+                                                    <a href="{{ route('users.show', ['username' => $comment->user->username]) }}" style="color:{{ $comment->user->group->color }};">(<span><i class="{{ $comment->user->group->icon }}"></i> {{ $comment->user->username }}</span>)</a> @endif
+                                            @else
+                                                <a href="{{ route('users.show', ['username' => $comment->user->username]) }}"
+                                                   class="pull-left" style="padding-right: 10px;">
+                                                    @if ($comment->user->image != null)
+                                                        <img src="{{ url('files/img/' . $comment->user->image) }}"
+                                                             alt="{{ $comment->user->username }}" class="img-avatar-48"></a>
+                                                @else
+                                                    <img src="{{ url('img/profile.png') }}"
+                                                         alt="{{ $comment->user->username }}" class="img-avatar-48"></a>
+                                                @endif
+                                                <strong><a
+                                                            href="{{ route('users.show', ['username' => $comment->user->username]) }}" style="color:{{ $comment->user->group->color }};"><span><i class="{{ $comment->user->group->icon }}"></i> {{ $comment->user->username }}</span></a></strong> @endif
+                                            <span class="text-muted"><small><em>{{$comment->created_at->diffForHumans() }}</em></small></span>
+                                            @if ($comment->user_id == auth()->id() || auth()->user()->group->is_modo)
+                                                <a title="@lang('common.delete-your-comment')"
+                                                   href="{{route('comment_delete',['comment_id'=>$comment->id])}}"><i
+                                                            class="pull-right btn btn-danger btn-xs {{ config('other.font-awesome') }} fa fa-times" aria-hidden="true"></i></a>
+                                                <a title="@lang('common.edit-your-comment')" data-toggle="modal"
+                                                   data-target="#modal-comment-edit-{{ $comment->id }}"><i
+                                                            class="pull-right btn btn-warning btn-xs {{ config('other.font-awesome') }} fa-pencil"
+                                                            aria-hidden="true"></i></a>
+                                            @endif
+                                            <div class="pt-5">
+                                                @emojione($comment->getContentHtml())
+                                            </div>
+                                        </div>
+                                    </li>
+                                    @include('partials.modals', ['comment' => $comment])
+                                @endforeach
+                            @endif
+                        </ul>
+                    </div>
                 </div>
             </div>
-        @endforeach
-        <div class="text-center">
-            {{ $articles->links() }}
+
+            <br>
+
+            <div class="col-md-12">
+                <form role="form" method="POST" action="{{ route('comment_article', ['id' => $article->id]) }}">
+                    @csrf
+                    <div class="form-group">
+                        <label for="content">@lang('common.your-comment'):</label><span class="badge-extra">@lang('common.type')
+                            <strong>:</strong> @lang('common.for') emoji</span> <span
+                                class="badge-extra">BBCode @lang('common.is-allowed')</span>
+                        <textarea id="content" name="content" cols="30" rows="5" class="form-control"></textarea>
+                    </div>
+                    <button type="submit" class="btn btn-danger">@lang('common.submit')</button>
+                    <label class="radio-inline"><strong>@lang('common.anonymous') @lang('common.comment')
+                            :</strong></label>
+                    <label>
+                        <input type="radio" value="1" name="anonymous">
+                    </label> @lang('common.yes')
+                    <label>
+                        <input type="radio" value="0" checked="checked" name="anonymous">
+                    </label> @lang('common.no')
+                </form>
+            </div>
         </div>
     </div>
 @endsection
+
+@section('javascripts')
+    <script nonce="{{ Bepsvpt\SecureHeaders\SecureHeaders::nonce() }}">
+      $(document).ready(function () {
+
+        $('#content').wysibb({});
+
+        emoji.textcomplete()
+      })
+    </script>
+@endsection
diff --git a/resources/views/graveyard/results.blade.php b/resources/views/graveyard/results.blade.php
index 68adea01e..9d01bf437 100644
--- a/resources/views/graveyard/results.blade.php
+++ b/resources/views/graveyard/results.blade.php
@@ -62,7 +62,7 @@
                             {{-- Resurrect Modal --}}
                             <div class="modal fade" id="resurrect-{{ $torrent->id }}" tabindex="-1" role="dialog"
                                  aria-labelledby="resurrect">
-                                <div class="modal-dialog" role="document">
+                                <div class="modal-dialog modal-dark" role="document">
                                     <div class="modal-content">
                                         <div class="modal-header">
                                             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
diff --git a/resources/views/partials/modals.blade.php b/resources/views/partials/modals.blade.php
index 14b239831..ea0c9c0e5 100644
--- a/resources/views/partials/modals.blade.php
+++ b/resources/views/partials/modals.blade.php
@@ -1,5 +1,5 @@
 <div class="modal fade" id="modal-comment-edit-{{ $comment->id }}" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog modal-dark">
         <div class="modal-content">
             <meta charset="utf-8">
             <title>@lang('common.edit-your-comment')</title>
diff --git a/resources/views/partials/pmmenu.blade.php b/resources/views/partials/pmmenu.blade.php
index 8ef7e0695..a4dc2aa37 100644
--- a/resources/views/partials/pmmenu.blade.php
+++ b/resources/views/partials/pmmenu.blade.php
@@ -1,12 +1,12 @@
 <div class="col-md-2">
     <div class="block">
-        <a href="{{ route('create', ['username' => auth()->user()->username]) }}"
+        <a href="{{ route('create') }}"
            class="btn btn-primary btn-block">@lang('pm.new')</a>
         <div class="separator"></div>
         <div class="list-group">
-            <a href="{{ route('inbox', ['username' => auth()->user()->username]) }}"
+            <a href="{{ route('inbox') }}"
                class="btn btn-primary btn-block">@lang('pm.inbox')</a>
-            <a href="{{ route('outbox', ['username' => auth()->user()->username]) }}"
+            <a href="{{ route('outbox') }}"
                class="btn btn-primary btn-block">@lang('pm.outbox')</a>
         </div>
     </div>
diff --git a/resources/views/partials/side_nav.blade.php b/resources/views/partials/side_nav.blade.php
index 86f80ba7d..868d964d5 100644
--- a/resources/views/partials/side_nav.blade.php
+++ b/resources/views/partials/side_nav.blade.php
@@ -85,21 +85,21 @@
             </a>
         </li>
         <li>
-            <a href="{{ route('inbox', ['username' => auth()->user()->username]) }}">
+            <a href="{{ route('inbox') }}">
                 <i class="{{ config('other.font-awesome') }} fa-envelope" style=" font-size: 18px; color: #ffffff;"></i>
                 <span class="menu-text">@lang('pm.inbox')</span>
                 <span class="selected"></span>
             </a>
         </li>
         <li>
-            <a href="{{ route('home.index') }}/page/rules.1">
+            <a href="{{ config('other.rules_url') }}">
                 <i class="{{ config('other.font-awesome') }} fa-info-square" style=" font-size: 18px; color: #ffffff;"></i>
                 <span class="menu-text">@lang('common.rules')</span>
                 <span class="selected"></span>
             </a>
         </li>
         <li>
-            <a href="{{ route('home.index') }}/page/faq.3">
+            <a href="{{ config('other.faq_url') }}">
                 <i class="{{ config('other.font-awesome') }} fa-question-square" style=" font-size: 18px; color: #ffffff;"></i>
                 <span class="menu-text">@lang('common.faq')</span>
                 <span class="selected"></span>
diff --git a/resources/views/partials/top_nav.blade.php b/resources/views/partials/top_nav.blade.php
index 0ae008f30..f269fc3b5 100644
--- a/resources/views/partials/top_nav.blade.php
+++ b/resources/views/partials/top_nav.blade.php
@@ -12,7 +12,7 @@
         <ul class="left-navbar">
             <li class="dropdown hoe-rheader-submenu message-notification left-min-30">
                 @php $pm = DB::table('private_messages')->where('receiver_id', '=', auth()->user()->id)->where('read', '=', '0')->count(); @endphp
-                <a href="{{ route('inbox', ['username' => auth()->user()->username]) }}"
+                <a href="{{ route('inbox') }}"
                    class="dropdown-toggle icon-circle">
                     <i class="{{ config('other.font-awesome') }} fa-envelope text-blue"></i>
                     @if ($pm > 0)
diff --git a/resources/views/playlist/show.blade.php b/resources/views/playlist/show.blade.php
index 413b20b31..d6e80d0cf 100644
--- a/resources/views/playlist/show.blade.php
+++ b/resources/views/playlist/show.blade.php
@@ -355,7 +355,7 @@
 
 	{{-- Add Torrent Modal --}}
 	<div class="modal fade" id="modal_playlist_torrent" tabindex="-1" role="dialog" aria-hidden="true">
-		<div class="modal-dialog modal-lg">
+		<div class="modal-dialog modal-dark">
 			<div class="modal-content">
 				<div class="container-fluid">
 					<form role="form" method="POST" action="{{ route('playlists.attach') }}">
diff --git a/resources/views/requests/request_modals.blade.php b/resources/views/requests/request_modals.blade.php
index 68ae940e7..9767d6f40 100644
--- a/resources/views/requests/request_modals.blade.php
+++ b/resources/views/requests/request_modals.blade.php
@@ -1,6 +1,6 @@
 {{-- Vote Modal --}}
 <div class="modal fade" id="vote" tabindex="-1" role="dialog" aria-labelledby="vote">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-dark" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="@lang('common.close')"><span
@@ -37,7 +37,7 @@
 
 {{-- Fulfill Modal --}}
 <div class="modal fade" id="fill" tabindex="-1" role="dialog" aria-labelledby="fill">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-dark" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="@lang('common.close')"><span
@@ -74,7 +74,7 @@
 
 {{-- Reset Modal --}}
 <div class="modal fade" id="reset" tabindex="-1" role="dialog" aria-labelledby="reset">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-dark" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="@lang('common.close')"><span
@@ -100,7 +100,7 @@
 
 {{-- Delete Modal --}}
 <div class="modal fade" id="delete" tabindex="-1" role="dialog" aria-labelledby="delete">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-dark" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="@lang('common.close')"><span
@@ -128,7 +128,7 @@
 
 {{-- Claim Modal --}}
 <div class="modal fade" id="claim" tabindex="-1" role="dialog" aria-labelledby="claim">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-dark" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="@lang('common.close')"><span
@@ -165,7 +165,7 @@
 
 {{-- Report Modal --}}
 <div class="modal fade" id="modal_request_report" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog modal-dark">
         <div class="modal-content">
             <meta charset="utf-8">
             <title>@lang('request.report'): {{ $torrentRequest->name }}</title>
diff --git a/resources/views/seedbox/index.blade.php b/resources/views/seedbox/index.blade.php
index 964f1e108..f47221946 100644
--- a/resources/views/seedbox/index.blade.php
+++ b/resources/views/seedbox/index.blade.php
@@ -76,7 +76,7 @@
 
     {{-- Add Seedbox Modal --}}
     <div class="modal fade" id="seedbox" tabindex="-1" role="dialog" aria-labelledby="seedbox">
-        <div class="modal-dialog" role="document">
+        <div class="modal-dialog modal-dark" role="document">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="@lang('common.close')"><span
diff --git a/resources/views/torrent/torrent_modals.blade.php b/resources/views/torrent/torrent_modals.blade.php
index 02a82b49e..9a0a9a9ce 100644
--- a/resources/views/torrent/torrent_modals.blade.php
+++ b/resources/views/torrent/torrent_modals.blade.php
@@ -1,6 +1,6 @@
 {{-- Report Modal --}}
 <div class="modal fade" id="modal_torrent_report" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog modal-dark">
         <div class="modal-content">
             <meta charset="utf-8">
             <title>@lang('common.report') {{ strtolower(trans('torrent.torrent')) }}: {{ $torrent->name }}</title>
@@ -45,7 +45,7 @@
 
 {{-- Delete Modal --}}
 <div class="modal fade" id="modal_torrent_delete" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog modal-dark">
         <div class="modal-content">
             <meta charset="utf-8">
             <title>@lang('common.delete') {{ strtolower(trans('torrent.torrent')) }}: {{ $torrent->name }}</title>
@@ -92,7 +92,7 @@
 
 {{-- Files Modal --}}
 <div id="myModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-dark">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
@@ -130,7 +130,7 @@
 {{-- NFO Modal --}}
 @if ($torrent->nfo != null)
     <div class="modal fade slideExpandUp" id="modal-10" role="dialog" aria-labelledby="Modallabel3dsign">
-        <div class="modal-dialog" role="document">
+        <div class="modal-dialog modal-dark" role="document">
             <div class="modal-content ">
                 <div class="modal-header bg-info ">
                     <h4 class="modal-title" id="Modallabel3dsign">NFO</h4>
@@ -153,7 +153,7 @@
      aria-hidden="true">
     <form method="POST" action="{{ route('staff.moderation.postpone') }}">
         @csrf
-        <div class="modal-dialog modal-lg">
+        <div class="modal-dialog modal-dark">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal"
@@ -192,7 +192,7 @@
 <div class="modal fade" id="reject-{{ $torrent->id }}" tabindex="-1" role="dialog" aria-hidden="true">
     <form method="POST" action="{{ route("staff.moderation.reject") }}">
         @csrf
-        <div class="modal-dialog modal-lg">
+        <div class="modal-dialog modal-dark">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal"
@@ -235,7 +235,7 @@
 
 {{-- Add Torrent To Playlist Modal --}}
 <div class="modal fade" id="modal_playlist_torrent" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
+    <div class="modal-dialog modal-dark">
         <div class="modal-content">
             <div class="container-fluid">
                 <form role="form" method="POST" action="{{ route('playlists.attach') }}">
diff --git a/resources/views/user/private/active.blade.php b/resources/views/user/private/active.blade.php
index c59b407fc..d3f27a618 100644
--- a/resources/views/user/private/active.blade.php
+++ b/resources/views/user/private/active.blade.php
@@ -6,7 +6,7 @@
 
 @section('breadcrumb')
     <li>
-        <a href="{{ route('user_profile', ['username' => $user->username]) }}" itemprop="url"
+        <a href="{{ route('users.show', ['username' => $user->username]) }}" itemprop="url"
            class="l-breadcrumb-item-link">
             <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $user->username }}</span>
         </a>
diff --git a/resources/views/user/private/downloads.blade.php b/resources/views/user/private/downloads.blade.php
index 24df47bbe..d358cbb26 100644
--- a/resources/views/user/private/downloads.blade.php
+++ b/resources/views/user/private/downloads.blade.php
@@ -6,7 +6,7 @@
 
 @section('breadcrumb')
     <li>
-        <a href="{{ route('user_profile', ['username' => $user->username]) }}" itemprop="url"
+        <a href="{{ route('users.show', ['username' => $user->username]) }}" itemprop="url"
            class="l-breadcrumb-item-link">
             <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $user->username }}</span>
         </a>
diff --git a/resources/views/user/private/requests.blade.php b/resources/views/user/private/requests.blade.php
index 9b7601605..f0b534a10 100644
--- a/resources/views/user/private/requests.blade.php
+++ b/resources/views/user/private/requests.blade.php
@@ -6,7 +6,7 @@
 
 @section('breadcrumb')
     <li>
-        <a href="{{ route('user_profile', ['username' => $user->username]) }}" itemprop="url"
+        <a href="{{ route('users.show', ['username' => $user->username]) }}" itemprop="url"
            class="l-breadcrumb-item-link">
             <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $user->username }}</span>
         </a>
diff --git a/resources/views/user/private/resurrections.blade.php b/resources/views/user/private/resurrections.blade.php
index 6bd8e36ae..680f80603 100644
--- a/resources/views/user/private/resurrections.blade.php
+++ b/resources/views/user/private/resurrections.blade.php
@@ -6,7 +6,7 @@
 
 @section('breadcrumb')
     <li>
-        <a href="{{ route('user_profile', ['username' => $user->username]) }}" itemprop="url"
+        <a href="{{ route('users.show', ['username' => $user->username]) }}" itemprop="url"
            class="l-breadcrumb-item-link">
             <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $user->username }}</span>
         </a>
diff --git a/resources/views/user/private/seeds.blade.php b/resources/views/user/private/seeds.blade.php
index a94c714b4..a375e6f45 100644
--- a/resources/views/user/private/seeds.blade.php
+++ b/resources/views/user/private/seeds.blade.php
@@ -6,7 +6,7 @@
 
 @section('breadcrumb')
     <li>
-        <a href="{{ route('user_profile', ['username' => $user->username]) }}" itemprop="url"
+        <a href="{{ route('users.show', ['username' => $user->username]) }}" itemprop="url"
            class="l-breadcrumb-item-link">
             <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $user->username }}</span>
         </a>
diff --git a/resources/views/user/private/unsatisfieds.blade.php b/resources/views/user/private/unsatisfieds.blade.php
index 028ec54ae..294753e8b 100644
--- a/resources/views/user/private/unsatisfieds.blade.php
+++ b/resources/views/user/private/unsatisfieds.blade.php
@@ -6,7 +6,7 @@
 
 @section('breadcrumb')
     <li>
-        <a href="{{ route('user_profile', ['username' => $user->username]) }}" itemprop="url"
+        <a href="{{ route('users.show', ['username' => $user->username]) }}" itemprop="url"
            class="l-breadcrumb-item-link">
             <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $user->username }}</span>
         </a>
diff --git a/resources/views/user/private/uploads.blade.php b/resources/views/user/private/uploads.blade.php
index c715934b5..39216ca73 100644
--- a/resources/views/user/private/uploads.blade.php
+++ b/resources/views/user/private/uploads.blade.php
@@ -6,7 +6,7 @@
 
 @section('breadcrumb')
     <li>
-        <a href="{{ route('user_profile', ['username' => $user->username]) }}" itemprop="url"
+        <a href="{{ route('users.show', ['username' => $user->username]) }}" itemprop="url"
            class="l-breadcrumb-item-link">
             <span itemprop="title" class="l-breadcrumb-item-link-title">{{ $user->username }}</span>
         </a>
diff --git a/resources/views/vendor/flash/templates/bootstrap/modal.blade.php b/resources/views/vendor/flash/templates/bootstrap/modal.blade.php
index ed8448bd5..63fc00183 100644
--- a/resources/views/vendor/flash/templates/bootstrap/modal.blade.php
+++ b/resources/views/vendor/flash/templates/bootstrap/modal.blade.php
@@ -1,5 +1,5 @@
 <div id="flash-overlay-modal" class="modal fade {{ $modalClass ?? '' }}">
-    <div class="modal-dialog">
+    <div class="modal-dialog modal-dark">
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
diff --git a/resources/views/vendor/log-viewer/bootstrap-3/show.blade.php b/resources/views/vendor/log-viewer/bootstrap-3/show.blade.php
index 999b2214d..e02bac457 100644
--- a/resources/views/vendor/log-viewer/bootstrap-3/show.blade.php
+++ b/resources/views/vendor/log-viewer/bootstrap-3/show.blade.php
@@ -184,7 +184,7 @@
 @section('modals')
     {{-- DELETE MODAL --}}
     <div id="delete-log-modal" class="modal fade">
-        <div class="modal-dialog">
+        <div class="modal-dialog modal-dark">
             <form id="delete-log-form" action="{{ route('log-viewer::logs.delete') }}" method="POST">
                 @method('DELETE')
                 @csrf
diff --git a/resources/views/vendor/log-viewer/logs.blade.php b/resources/views/vendor/log-viewer/logs.blade.php
index f4141a036..b93b608ea 100644
--- a/resources/views/vendor/log-viewer/logs.blade.php
+++ b/resources/views/vendor/log-viewer/logs.blade.php
@@ -70,7 +70,7 @@
 @section('modals')
     {{-- DELETE MODAL --}}
     <div id="delete-log-modal" class="modal fade">
-        <div class="modal-dialog">
+        <div class="modal-dialog modal-dark">
             <form id="delete-log-form" action="{{ route('log-viewer::logs.delete') }}" method="POST">
                 @method('DELETE')
                 @csrf
diff --git a/resources/views/vendor/log-viewer/show.blade.php b/resources/views/vendor/log-viewer/show.blade.php
index 3e25fd7aa..5f52fd335 100644
--- a/resources/views/vendor/log-viewer/show.blade.php
+++ b/resources/views/vendor/log-viewer/show.blade.php
@@ -133,7 +133,7 @@
 @section('modals')
     {{-- DELETE MODAL --}}
     <div id="delete-log-modal" class="modal fade">
-        <div class="modal-dialog">
+        <div class="modal-dialog modal-dark">
             <form id="delete-log-form" action="{{ route('log-viewer::logs.delete') }}" method="POST">
                 @method('DELETE')
                 @csrf
diff --git a/routes/web.php b/routes/web.php
index 34359e144..a2acbe9d9 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -219,11 +219,11 @@ Route::group(['middleware' => 'language'], function () {
             Route::get('/inbox', 'PrivateMessageController@getPrivateMessages')->name('inbox');
             Route::get('/message/{id}', 'PrivateMessageController@getPrivateMessageById')->name('message');
             Route::get('/outbox', 'PrivateMessageController@getPrivateMessagesSent')->name('outbox');
-            Route::get('/create/{receiver_id}/{username}', 'PrivateMessageController@makePrivateMessage')->name('create');
+            Route::get('/create', 'PrivateMessageController@makePrivateMessage')->name('create');
             Route::get('/mark-all-read', 'PrivateMessageController@markAllAsRead')->name('mark-all-read');
             Route::post('/send', 'PrivateMessageController@sendPrivateMessage')->name('send-pm');
-            Route::post('/reply/{id}', 'PrivateMessageController@replyPrivateMessage')->name('reply-pm');
-            Route::post('/delete/{id}', 'PrivateMessageController@deletePrivateMessage')->name('delete-pm');
+            Route::post('/{id}/reply', 'PrivateMessageController@replyPrivateMessage')->name('reply-pm');
+            Route::post('/{id}/destroy', 'PrivateMessageController@deletePrivateMessage')->name('delete-pm');
         });
 
         // Requests System
@@ -246,6 +246,11 @@ Route::group(['middleware' => 'language'], function () {
         });
 
         // Torrents System
+        Route::group(['prefix' => 'upload'], function () {
+            Route::get('/{title?}/{imdb?}/{tmdb?}', 'TorrentController@uploadForm')->name('upload_form');
+            Route::post('/', 'TorrentController@upload')->name('upload');
+        });
+
         Route::group(['prefix' => 'torrents'], function () {
             Route::get('/feedizeTorrents/{type}', 'TorrentController@feedize')->name('feedizeTorrents')->middleware('modo');
             Route::get('/filter', 'TorrentController@faceted');
@@ -254,12 +259,10 @@ Route::group(['middleware' => 'language'], function () {
             Route::get('/{id}{hash?}', 'TorrentController@torrent')->name('torrent');
             Route::get('/{id}/peers', 'TorrentController@peers')->name('peers');
             Route::get('/{id}/history', 'TorrentController@history')->name('history');
-            Route::get('/upload/{title?}/{imdb?}/{tmdb?}', 'TorrentController@uploadForm')->name('upload_form');
-            Route::post('/upload', 'TorrentController@upload')->name('upload');
             Route::get('/download_check/{id}', 'TorrentController@downloadCheck')->name('download_check');
             Route::get('/download/{id}', 'TorrentController@download')->name('download');
-            Route::get('/cards', 'TorrentController@cardLayout')->name('cards');
-            Route::get('/groupings', 'TorrentController@groupingLayout')->name('groupings');
+            Route::get('/view/cards', 'TorrentController@cardLayout')->name('cards');
+            Route::get('/view/groupings', 'TorrentController@groupingLayout')->name('groupings');
             Route::post('/delete', 'TorrentController@deleteTorrent')->name('delete');
             Route::get('/{id}/edit', 'TorrentController@editForm')->name('edit_form');
             Route::post('/{id}/edit', 'TorrentController@edit')->name('edit');
@@ -311,7 +314,6 @@ Route::group(['middleware' => 'language'], function () {
 
             Route::get('/{username}/settings', 'UserController@settings')->name('user_settings');
             Route::get('/{username}/settings/privacy{hash?}', 'UserController@privacy')->name('user_privacy');
-            Route::get('/{username}/settings/profile', 'UserController@profile')->name('user_profile');
             Route::get('/{username}/settings/security{hash?}', 'UserController@security')->name('user_security');
             Route::get('/{username}/settings/notification{hash?}', 'UserController@notification')->name('user_notification');
             Route::post('/{username}/settings/change_settings', 'UserController@changeSettings')->name('change_settings');
@@ -401,8 +403,8 @@ Route::group(['middleware' => 'language'], function () {
                 Route::get('/filter', 'NotificationController@faceted');
                 Route::get('/', 'NotificationController@index')->name('index');
                 Route::get('/{id}', 'NotificationController@show')->name('show');
-                Route::get('/{id}/update', 'NotificationController@update')->name('update');
-                Route::get('/updateall', 'NotificationController@updateAll')->name('updateall');
+                Route::post('/{id}/update', 'NotificationController@update')->name('update');
+                Route::post('/updateall', 'NotificationController@updateAll')->name('updateall');
                 Route::delete('/{id}/destroy', 'NotificationController@destroy')->name('destroy');
                 Route::delete('/destroyall', 'NotificationController@destroyAll')->name('destroyall');
             });
@@ -486,23 +488,23 @@ Route::group(['middleware' => 'language'], function () {
             Route::get('/forum/{id}/new-topic', 'TopicController@addForm')->name('forum_new_topic_form');
             Route::post('/forum/{id}/new-topic', 'TopicController@newTopic')->name('forum_new_topic');
             // View Topic
-            Route::get('/topic/{id}', 'TopicController@topic')->name('forum_topic');
+            Route::get('/{id}{page?}{post?}', 'TopicController@topic')->name('forum_topic');
             // Close Topic
-            Route::get('/topic/{id}/close', 'TopicController@closeTopic')->name('forum_close');
+            Route::get('/{id}/close', 'TopicController@closeTopic')->name('forum_close');
             // Open Topic
-            Route::get('/topic/{id}/open', 'TopicController@openTopic')->name('forum_open');
+            Route::get('/{id}/open', 'TopicController@openTopic')->name('forum_open');
             //
             Route::post('/posts/{id}/tip_poster', 'BonusController@tipPoster')->name('tip_poster');
 
             // Edit Topic
-            Route::get('/topic/{id}/edit', 'TopicController@editForm')->name('forum_edit_topic_form');
-            Route::post('/topic/{id}/edit', 'TopicController@editTopic')->name('forum_edit_topic');
+            Route::get('/{id}/edit', 'TopicController@editForm')->name('forum_edit_topic_form');
+            Route::post('/{id}/edit', 'TopicController@editTopic')->name('forum_edit_topic');
             // Delete Topic
-            Route::get('/topic/{id}/delete', 'TopicController@deleteTopic')->name('forum_delete_topic');
+            Route::get('/{id}/delete', 'TopicController@deleteTopic')->name('forum_delete_topic');
             // Pin Topic
-            Route::get('/topic/{id}/pin', 'TopicController@pinTopic')->name('forum_pin_topic');
+            Route::get('/{id}/pin', 'TopicController@pinTopic')->name('forum_pin_topic');
             // Unpin Topic
-            Route::get('/topic/{id}/unpin', 'TopicController@unpinTopic')->name('forum_unpin_topic');
+            Route::get('/{id}/unpin', 'TopicController@unpinTopic')->name('forum_unpin_topic');
         });
 
         // Topic Label System
@@ -710,7 +712,7 @@ Route::group(['middleware' => 'language'], function () {
 
         // Mass Actions
         Route::group(['prefix' => 'mass-actions'], function () {
-            Route::get('/validate', 'MassActionController@validate')->name('staff.mass-actions.validate');
+            Route::get('/validate-users', 'MassActionController@update')->name('staff.mass-actions.validate');
             Route::get('/mass-pm', 'MassActionController@create')->name('staff.mass-pm.create');
             Route::post('/mass-pm/store', 'MassActionController@store')->name('staff.mass-pm.store');
         });