diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index 598695ca..15e3b62d 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -44,7 +44,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                         <button id="create-button" class="btn btn-success">Create New Element [!]</button>
                     </div>
                     <div class="col-md-12">
-                        <table class="table table-default">
+                        <table class="table table-striped">
                             <thead>
                             <tr>
                                 <th>ID</th>
@@ -190,6 +190,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
 </div>
 <p style="display: none" id="lang_edit"><?php echo $hesklang['edit']; ?></p>
 <p style="display: none" id="lang_delete"><?php echo $hesklang['delete']; ?></p>
+<p style="display: none" id="lang_no_custom_nav_elements_found"><?php echo $hesklang['no_custom_nav_elements_found']; ?></p>
 <script type="text/html" id="nav-element-template">
     <tr>
         <td><span data-property="id"></span></td>
diff --git a/api/DataAccess/Navigation/CustomNavElementGateway.php b/api/DataAccess/Navigation/CustomNavElementGateway.php
index 77671891..56981b89 100644
--- a/api/DataAccess/Navigation/CustomNavElementGateway.php
+++ b/api/DataAccess/Navigation/CustomNavElementGateway.php
@@ -14,7 +14,8 @@ class CustomNavElementGateway extends CommonDao {
 
         $rs = hesk_dbQuery("SELECT {$columns} FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element` AS `t1`
             INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "custom_nav_element_to_text` AS `t2`
-                ON `t1`.`id` = `t2`.`nav_element_id`");
+                ON `t1`.`id` = `t2`.`nav_element_id`
+            ORDER BY `t1`.`place` ASC, `t1`.`sort` ASC");
 
         $elements = array();
 
diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php
index 43e3e21d..93dee04f 100644
--- a/install/mods-for-hesk/sql/installSql.php
+++ b/install/mods-for-hesk/sql/installSql.php
@@ -997,7 +997,8 @@ function execute310Scripts() {
         (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
          image_url TEXT,
          font_icon VARCHAR(200),
-         place INT NOT NULL)");
+         place INT NOT NULL,
+         sort INT NOT NULL)");
     executeQuery("CREATE TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "custom_nav_element_to_text`
         (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
          nav_element_id INT NOT NULL,
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index a0c92c0c..0278f81c 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -103,6 +103,7 @@ $(document).ready(function() {
 
 function loadTable(modalToClose) {
     var heskUrl = $('#heskUrl').text();
+    var notFoundText = $('#lang_no_custom_nav_elements_found').text();
     var places = [];
     places[1] = 'Homepage - Block';
     places[2] = 'Customer Navbar';
@@ -116,7 +117,26 @@ function loadTable(modalToClose) {
             $('#table-body').html('');
             elements = [];
 
+            if (data.length === 0) {
+                $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
+                return;
+            }
+
+            $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[1] + '</b></i></td></tr>');
+            var currentPlace = 1;
+            var addedElementToPlace = false;
             $.each(data, function() {
+                if (this.place !== currentPlace) {
+                    if (!addedElementToPlace) {
+                        $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
+                    }
+
+                    $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[this.place] + '</b></i></td></tr>');
+                    currentPlace = this.place;
+                    console.log(this);
+                    addedElementToPlace = false;
+                }
+
                 var $template = $($('#nav-element-template').html());
 
                 $template.find('span[data-property="id"]').text(this.id);
@@ -147,8 +167,20 @@ function loadTable(modalToClose) {
                 $('#table-body').append($template);
 
                 elements[this.id] = this;
+
+                addedElementToPlace = true;
             });
 
+            //-- Add missing headers if no elements are in them
+            if (currentPlace === 1) {
+                $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[2] + '</b></i></td></tr>');
+                $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
+            }
+            if (currentPlace === 2) {
+                $('#table-body').append('<tr><td colspan="6" class="bg-gray"><i><b>' + places[3] + '</b></i></td></tr>');
+                $('#table-body').append('<tr><td colspan="6">' + notFoundText + '</td></tr>');
+            }
+
             if (modalToClose !== undefined) {
                 modalToClose.modal('hide');
             }
diff --git a/language/en/text.php b/language/en/text.php
index 6a03a541..77c69ffb 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -53,6 +53,7 @@ $hesklang['email_notification_sent'] = 'Email notification sent!';
 $hesklang['email_notification_resend_failed'] = 'Error occurred when trying to send notification email.';
 $hesklang['edit_category'] = 'Edit Category';
 $hesklang['custom_nav_element_deleted'] = 'Custom Navigation Element Deleted!';
+$hesklang['no_custom_nav_elements_found'] = 'No custom nav menu elements found';
 
 // ADDED OR MODIFIED IN Mods for HESK 3.0.0
 $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on #