diff --git a/custom/panel_templates/Default/assets/css/custom.css b/custom/panel_templates/Default/assets/css/custom.css
index 4b7ea5f0ab..a68379d0f4 100644
--- a/custom/panel_templates/Default/assets/css/custom.css
+++ b/custom/panel_templates/Default/assets/css/custom.css
@@ -469,3 +469,8 @@ footer.sticky-footer {
     height: 16px;
     width: 16px;
 }
+
+/* Make buttons dimmed when parent table row is not hovered */
+.forumEditingRow:not(:hover) .btn {
+    opacity: 0.5;
+}
diff --git a/custom/panel_templates/Default/forum/forums.tpl b/custom/panel_templates/Default/forum/forums.tpl
index cc4a40c619..878e31f128 100644
--- a/custom/panel_templates/Default/forum/forums.tpl
+++ b/custom/panel_templates/Default/forum/forums.tpl
@@ -36,56 +36,123 @@
                     <div class="card shadow mb-4">
                         <div class="card-body">
 
-                            <a href="{$NEW_FORUM_LINK}" class="btn btn-primary" {if count($FORUMS_ARRAY)}
-                                style="margin-bottom: 15px;" {/if}>{$NEW_FORUM}</a>
-                            {if !count($FORUMS_ARRAY)}
-                            <hr />
+                            <a href="{$NEW_CATEGORY_LINK}" class="btn btn-primary">
+                                {$NEW_CATEGORY}
+                            </a>
+                            {if count($CATEGORIES_ARRAY)}
+                                <hr>
                             {/if}
 
                             <!-- Success and Error Alerts -->
                             {include file='includes/alerts.tpl'}
 
-                            {if count($FORUMS_ARRAY)}
-                            <div class="table-responsive">
-                                <table class="table">
-                                    <tbody id="sortable">
-                                        {foreach from=$FORUMS_ARRAY item=item name=forum_array}
-                                        <tr data-id="{$item.id}">
-                                            <td {if $item.parent_forum} style="padding-left:{math equation="x * y" x=25 y=$item.parent_forum_count}px" {/if}>
-                                                <a href="{$item.edit_link}">{$item.title}</a>{if $item.parent_forum}
-                                                <small>| {$item.parent_forum}</small>{/if}<br />{$item.description}
-                                            </td>
-                                            <td width="10%">
-                                                <div class="float-md-right">
-                                                    {if $item.up_link}
-                                                    <form action="{$item.up_link}" method="post"
-                                                        style="display: inline">
-                                                        <input type="hidden" name="token" value="{$TOKEN}" />
-                                                        <button class="btn btn-success btn-sm"><i
-                                                                class="fas fa-chevron-up"></i></button>
-                                                    </form>
+                            {if count($CATEGORIES_ARRAY)}
+                                {foreach from=$CATEGORIES_ARRAY item=category}
+                                    <table class="table table-bordered table-sm">
+                                        <thead>
+                                            <tr style="background-color: #ededed;" class="forumEditingRow">
+                                                <th style="width: 70%">
+                                                    {$category.title}
+                                                    {if $category.description}
+                                                        <br>
+                                                        <small>
+                                                            {$category.description}
+                                                        </small>
                                                     {/if}
-                                                    {if $item.down_link}
-                                                    <form action="{$item.down_link}" method="post"
-                                                        style="display: inline">
-                                                        <input type="hidden" name="token" value="{$TOKEN}" />
-                                                        <button class="btn btn-warning btn-sm"><i
-                                                                class="fas fa-chevron-down"></i></button>
-                                                    </form>
+                                                </th>
+                                                <th class="text-right align-middle">
+                                                    <a class="btn btn-primary btn-sm" href="{$category.new_forum_link}">
+                                                        {$NEW_FORUM}
+                                                    </a>
+                                                    <a class="btn btn-secondary btn-sm" href="{$category.edit_link}">
+                                                        {$EDIT}
+                                                    </a>
+                                                    {if count($CATEGORIES_ARRAY) > 1}
+                                                        <button class="btn btn-secondary btn-sm">
+                                                            <i class="fas fa-up-down-left-right"></i>
+                                                        </button>
                                                     {/if}
-                                                    <a href="{$item.delete_link}" class="btn btn-danger btn-sm"><i
-                                                            class="fas fa-trash"></i></a>
-                                                </div>
-                                            </td>
-                                        </tr>
-                                        {/foreach}
-                                    </tbody>
-                                </table>
-                            </div>
+                                                    <a class="btn btn-danger btn-sm" href="{$category.delete_link}">
+                                                        <i class="fas fa-trash"></i>
+                                                    </a>
+                                                </th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            {foreach from=$category.subforums item=subforum}
+                                                <tr class="forumEditingRow">
+                                                    <td style="width: 70%">
+                                                        {$subforum.title}
+                                                        {if $subforum.description}
+                                                            <br>
+                                                            <small>
+                                                                {$subforum.description}
+                                                            </small>
+                                                        {/if}
+                                                    </td>
+                                                    <td class="text-right align-middle">
+                                                        <a class="btn btn-secondary btn-sm" href="{$subforum.edit_link}">
+                                                            Edit
+                                                        </a>
+                                                        {if count($category.subforums) > 1}
+                                                            <button class="btn btn-secondary btn-sm">
+                                                                <i class="fas fa-up-down-left-right"></i>
+                                                            </button>
+                                                        {/if}
+                                                        <a class="btn btn-danger btn-sm" href="{$subforum.delete_link}">
+                                                            <i class="fas fa-trash"></i>
+                                                        </a>
+                                                    </td>
+                                                </tr>
+                                            {/foreach}
+                                        </tbody>
+                                    </table>
+                                {/foreach}
                             {else}
-                            <p>{$NO_FORUMS}</p>
+                                <p>{$NO_FORUMS}</p>
                             {/if}
 
+{*                            {if count($FORUMS_ARRAY)}*}
+{*                            <div class="table-responsive">*}
+{*                                <table class="table">*}
+{*                                    <tbody id="sortable">*}
+{*                                        {foreach from=$FORUMS_ARRAY item=item name=forum_array}*}
+{*                                        <tr data-id="{$item.id}">*}
+{*                                            <td {if $item.parent_forum} style="padding-left:{math equation="x * y" x=25 y=$item.parent_forum_count}px" {/if}>*}
+{*                                                <a href="{$item.edit_link}">{$item.title}</a>{if $item.parent_forum}*}
+{*                                                <small>| {$item.parent_forum}</small>{/if}<br />{$item.description}*}
+{*                                            </td>*}
+{*                                            <td width="10%">*}
+{*                                                <div class="float-md-right">*}
+{*                                                    {if $item.up_link}*}
+{*                                                    <form action="{$item.up_link}" method="post"*}
+{*                                                        style="display: inline">*}
+{*                                                        <input type="hidden" name="token" value="{$TOKEN}" />*}
+{*                                                        <button class="btn btn-success btn-sm"><i*}
+{*                                                                class="fas fa-chevron-up"></i></button>*}
+{*                                                    </form>*}
+{*                                                    {/if}*}
+{*                                                    {if $item.down_link}*}
+{*                                                    <form action="{$item.down_link}" method="post"*}
+{*                                                        style="display: inline">*}
+{*                                                        <input type="hidden" name="token" value="{$TOKEN}" />*}
+{*                                                        <button class="btn btn-warning btn-sm"><i*}
+{*                                                                class="fas fa-chevron-down"></i></button>*}
+{*                                                    </form>*}
+{*                                                    {/if}*}
+{*                                                    <a href="{$item.delete_link}" class="btn btn-danger btn-sm"><i*}
+{*                                                            class="fas fa-trash"></i></a>*}
+{*                                                </div>*}
+{*                                            </td>*}
+{*                                        </tr>*}
+{*                                        {/foreach}*}
+{*                                    </tbody>*}
+{*                                </table>*}
+{*                            </div>*}
+{*                            {else}*}
+{*                            <p>{$NO_FORUMS}</p>*}
+{*                            {/if}*}
+
                         </div>
                     </div>
 
@@ -109,38 +176,38 @@
     {include file='scripts.tpl'}
 
     <script type="text/javascript">
-        $(document).ready(function () {
-            $("#sortable").sortable({
-                start: function (event, ui) {
-                    let start_pos = ui.item.index();
-                    ui.item.data('startPos', start_pos);
-                },
-                update: function (event, ui) {
-                    let forums = $("#sortable").children();
-                    let toSubmit = [];
-                    forums.each(function () {
-                        toSubmit.push($(this).data().id);
-                    });
-
-                    $.ajax({
-                        url: "{$REORDER_DRAG_URL}",
-                        type: "GET",
-                        data: {
-                            action: "order",
-                            dir: "drag",
-                            {literal}forums: JSON.stringify({"forums": toSubmit}){/literal}
-                        },
-                        success: function (response) {
-                            // Success
-                        },
-                        error: function (xhr) {
-                            // Error
-                            console.log(xhr);
-                        }
-                    });
-                }
-            });
-        });
+        {*$(document).ready(function () {*}
+        {*    $("#sortable").sortable({*}
+        {*        start: function (event, ui) {*}
+        {*            let start_pos = ui.item.index();*}
+        {*            ui.item.data('startPos', start_pos);*}
+        {*        },*}
+        {*        update: function (event, ui) {*}
+        {*            let forums = $("#sortable").children();*}
+        {*            let toSubmit = [];*}
+        {*            forums.each(function () {*}
+        {*                toSubmit.push($(this).data().id);*}
+        {*            });*}
+
+        {*            $.ajax({*}
+        {*                url: "{$REORDER_DRAG_URL}",*}
+        {*                type: "GET",*}
+        {*                data: {*}
+        {*                    action: "order",*}
+        {*                    dir: "drag",*}
+        {*                    {literal}forums: JSON.stringify({"forums": toSubmit}){/literal}*}
+        {*                },*}
+        {*                success: function (response) {*}
+        {*                    // Success*}
+        {*                },*}
+        {*                error: function (xhr) {*}
+        {*                    // Error*}
+        {*                    console.log(xhr);*}
+        {*                }*}
+        {*            });*}
+        {*        }*}
+        {*    });*}
+        {*});*}
     </script>
 
 </body>
diff --git a/custom/panel_templates/Default/forum/forums_new_step_1.tpl b/custom/panel_templates/Default/forum/forums_new_step_1.tpl
index 13ffbbbcbf..c1bfc984f3 100644
--- a/custom/panel_templates/Default/forum/forums_new_step_1.tpl
+++ b/custom/panel_templates/Default/forum/forums_new_step_1.tpl
@@ -78,6 +78,9 @@
                                 </div>
                                 <div class="form-group">
                                     <input type="hidden" name="token" value="{$TOKEN}">
+                                    {if $PRESELECTED_CATEGORY}
+                                        <input type="hidden" name="pre_selected_category" value="{$PRESELECTED_CATEGORY}">
+                                    {/if}
                                     <input type="submit" class="btn btn-primary" value="{$SUBMIT}">
                                 </div>
                             </form>
@@ -132,4 +135,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/custom/panel_templates/Default/forum/forums_new_step_2.tpl b/custom/panel_templates/Default/forum/forums_new_step_2.tpl
index a16c7069c9..adb4684c40 100644
--- a/custom/panel_templates/Default/forum/forums_new_step_2.tpl
+++ b/custom/panel_templates/Default/forum/forums_new_step_2.tpl
@@ -55,7 +55,7 @@
                                     <label for="InputParent">{$SELECT_PARENT_FORUM}</label>
                                     <select class="form-control" id="InputParent" name="parent">
                                         {foreach from=$PARENT_FORUMS item=item}
-                                        <option value="{$item.id}">{$item.name}</option>
+                                            <option value="{$item.id}" {if isset($PRESELECTED_CATEGORY) && $PRESELECTED_CATEGORY == $item.id}selected{/if}>{$item.name}</option>
                                         {/foreach}
                                     </select>
                                 </div>
@@ -152,4 +152,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/modules/Forum/classes/Forum.php b/modules/Forum/classes/Forum.php
index 1c8b862457..1c7c951028 100644
--- a/modules/Forum/classes/Forum.php
+++ b/modules/Forum/classes/Forum.php
@@ -796,11 +796,11 @@ public function getAnySubforums(
      * @return array An array of the ids of the labels the user has access to
      */
     public static function getAccessibleLabels(array $labels, array $user_groups): array {
-        return array_reduce($labels, function(&$prev, $topic_label) use ($user_groups) {
+        return array_reduce($labels, static function (&$prev, $topic_label) use ($user_groups) {
             $label = DB::getInstance()->get('forums_topic_labels', ['id', $topic_label])->first();
             if ($label) {
                 $label_group_ids = explode(',', $label->gids);
-                $hasPerm = array_reduce($user_groups, fn($prev, $group_id) => $prev || in_array($group_id, $label_group_ids));
+                $hasPerm = array_reduce($user_groups, static fn ($prev, $group_id) => $prev || in_array($group_id, $label_group_ids));
                 if ($hasPerm) {
                     $prev[] = $label->id;
                 }
@@ -808,4 +808,18 @@ public static function getAccessibleLabels(array $labels, array $user_groups): a
             return $prev;
         }, []);
     }
+
+    public function recursiveGetSubForums(int $parent_id, array $current = []): array {
+        $forums = $this->_db->query(
+            'SELECT * FROM nl2_forums WHERE parent = ? ORDER BY forum_order',
+            [$parent_id]
+        );
+        if ($forums->count()) {
+            foreach ($forums->results() as $forum) {
+                $current[$parent_id][] = $forum;
+                $current = $this->recursiveGetSubForums($forum->id, $current);
+            }
+        }
+        return $current;
+    }
 }
diff --git a/modules/Forum/pages/panel/forums.php b/modules/Forum/pages/panel/forums.php
index 74f06c9255..a64a109a3b 100644
--- a/modules/Forum/pages/panel/forums.php
+++ b/modules/Forum/pages/panel/forums.php
@@ -20,56 +20,87 @@
 const PANEL_PAGE = 'forums';
 $page_title = $forum_language->get('forum', 'forums');
 require_once(ROOT_PATH . '/core/templates/backend_init.php');
+$forum = new Forum();
 
 if (!isset($_GET['action']) && !isset($_GET['forum'])) {
-    $forums = DB::getInstance()->orderAll('forums', 'forum_order', 'ASC')->results();
-    $template_array = [];
-
-    if (count($forums)) {
-        $i = 1;
-        $count = count($forums);
-        foreach ($forums as $item) {
-            if ($item->parent > 0) {
-                $parent_forum_query = DB::getInstance()->get('forums', ['id', $item->parent])->results();
-                if (count($parent_forum_query)) {
-                    $parent_forum_count = 1;
-                    $parent_forum = $forum_language->get('forum', 'parent_forum_x', ['forum' => Output::getClean($parent_forum_query[0]->forum_title)]);
-                    $id = $parent_forum_query[0]->parent;
-
-                    while ($parent_forum_count < 100 && $id > 0) {
-                        $parent_forum_query = DB::getInstance()->get('forums', ['id', $parent_forum_query[0]->parent])->results();
-                        $id = $parent_forum_query[0]->parent;
-                        $parent_forum_count++;
-                    }
-                } else {
-                    $parent_forum = null;
-                    $parent_forum_count = 0;
-                }
-            } else {
-                $parent_forum_count = 0;
-            }
-
-            $template_array[] = [
-                'edit_link' => URL::build('/panel/forums/', 'forum=' . Output::getClean($item->id)),
-                'delete_link' => URL::build('/panel/forums/', 'action=delete&fid=' . Output::getClean($item->id)),
-                'up_link' => ($i > 1 ? URL::build('/panel/forums/', 'action=order&dir=up&fid=' . Output::getClean($item->id)) : null),
-                'down_link' => ($i < $count ? URL::build('/panel/forums/', 'action=order&dir=down&fid=' . Output::getClean($item->id)) : null),
-                'title' => Output::getClean($item->forum_title),
-                'description' => Output::getPurified($item->forum_description),
-                'id' => Output::getClean($item->id),
-                'parent_forum' => (($item->parent > 0) ? $parent_forum : null),
-                'parent_forum_count' => $parent_forum_count
+    $categories_array = [];
+    $categories = DB::getInstance()->query("SELECT * FROM nl2_forums WHERE forum_type = 'category' AND parent = 0 ORDER BY forum_order")->results();
+    foreach ($categories as $category) {
+        $subforums = $forum->recursiveGetSubForums($category->id);
+        $subforums_array = [];
+
+        foreach ($subforums as $parent_id => $subforum) {
+            $subforum = $subforum[0];
+            $subforums_array[] = [
+                'title' => $subforum->forum_title,
+                'description' => $subforum->forum_description,
+                'edit_link' => URL::build('/panel/forums/', 'forum=' . $subforum->id),
+                'delete_link' => URL::build('/panel/forums/', 'action=delete&fid=' . $subforum->id),
             ];
-            $i++;
         }
+
+        $categories_array[] = [
+            'title' => $category->forum_title,
+            'description' => $category->forum_description,
+            'subforums' => $subforums_array,
+            'new_forum_link' => URL::build('/panel/forums/', 'action=new&category=' . $category->id),
+            'edit_link' => URL::build('/panel/forums/', 'forum=' . $category->id),
+            'delete_link' => URL::build('/panel/forums/', 'action=delete&fid=' . $category->id),
+        ];
     }
 
+    $smarty->assign([
+        'CATEGORIES_ARRAY' => $categories_array,
+    ]);
+
+//    $forums = DB::getInstance()->orderAll('forums', 'forum_order', 'ASC')->results();
+//    $template_array = [];
+//    $i = 1;
+//    $count = count($forums);
+//
+//    foreach ($forums as $item) {
+//        if ($item->parent > 0) {
+//            $parent_forum_query = DB::getInstance()->get('forums', ['id', $item->parent])->results();
+//            if (count($parent_forum_query)) {
+//                $parent_forum_count = 1;
+//                $parent_forum = $forum_language->get('forum', 'parent_forum_x', ['forum' => Output::getClean($parent_forum_query[0]->forum_title)]);
+//                $id = $parent_forum_query[0]->parent;
+//
+//                while ($parent_forum_count < 100 && $id > 0) {
+//                    $parent_forum_query = DB::getInstance()->get('forums', ['id', $parent_forum_query[0]->parent])->results();
+//                    $id = $parent_forum_query[0]->parent;
+//                    $parent_forum_count++;
+//                }
+//            } else {
+//                $parent_forum = null;
+//                $parent_forum_count = 0;
+//            }
+//        } else {
+//            $parent_forum_count = 0;
+//        }
+//
+//        $template_array[] = [
+//            'edit_link' => URL::build('/panel/forums/', 'forum=' . Output::getClean($item->id)),
+//            'delete_link' => URL::build('/panel/forums/', 'action=delete&fid=' . Output::getClean($item->id)),
+//            'up_link' => ($i > 1 ? URL::build('/panel/forums/', 'action=order&dir=up&fid=' . Output::getClean($item->id)) : null),
+//            'down_link' => ($i < $count ? URL::build('/panel/forums/', 'action=order&dir=down&fid=' . Output::getClean($item->id)) : null),
+//            'title' => Output::getClean($item->forum_title),
+//            'description' => Output::getPurified($item->forum_description),
+//            'id' => Output::getClean($item->id),
+//            'parent_forum' => (($item->parent > 0) ? $parent_forum : null),
+//            'parent_forum_count' => $parent_forum_count
+//        ];
+//        $i++;
+//    }
+
     $forum_reactions = Util::getSetting('forum_reactions');
 
     $smarty->assign([
+        'NEW_CATEGORY' => $forum_language->get('forum', 'new_category'),
+        'NEW_CATEGORY_LINK' => URL::build('/panel/forums/', 'action=new_category'),
         'NEW_FORUM' => $forum_language->get('forum', 'new_forum'),
-        'NEW_FORUM_LINK' => URL::build('/panel/forums/', 'action=new'),
-        'FORUMS_ARRAY' => $template_array,
+        'EDIT' => $language->get('general', 'edit'),
+        // 'FORUMS_ARRAY' => $template_array,
         'NO_FORUMS' => $forum_language->get('forum', 'no_forums'),
         'REORDER_DRAG_URL' => URL::build('/panel/forums')
     ]);
@@ -143,6 +174,12 @@
                         }
                     }
 
+                    if (isset($_GET['category'])) {
+                        $smarty->assign([
+                            'PRESELECTED_CATEGORY' => $_GET['category']
+                        ]);
+                    }
+
                     $smarty->assign([
                         'FORUM_TYPE' => $forum_language->get('forum', 'forum_type'),
                         'FORUM_TYPE_FORUM' => $forum_language->get('forum', 'forum_type_forum'),
@@ -246,6 +283,13 @@
                             }
                         }
                     }
+
+                    if (isset($_POST['preselected_category'])) {
+                        $smarty->assign([
+                            'PRESELECTED_CATEGORY' => $_POST['preselected_category']
+                        ]);
+                    }
+
                     $smarty->assign([
                         'SELECT_PARENT_FORUM' => $forum_language->get('forum', 'select_a_parent_forum'),
                         'PARENT_FORUMS' => $template_array,