From 72ae933042c2838c7489e3a8b3829ea712640e79 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Mon, 22 Feb 2021 10:18:50 +0500
Subject: [PATCH] enroute fixing
 https://github.com/usmannasir/cyberpanel/issues/527

---
 .../templates/baseTemplate/index.html         | 1696 +++++++++--------
 baseTemplate/views.py                         |   25 +-
 plogical/acl.py                               |   79 +-
 plogical/httpProc.py                          |    9 +-
 .../static/userManagment/userManagment.js     |    6 +
 .../templates/userManagment/createACL.html    |   11 +
 .../templates/userManagment/modifyACL.html    |   11 +
 userManagment/views.py                        |  209 +-
 8 files changed, 948 insertions(+), 1098 deletions(-)

diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index b4494b926..171a83149 100755
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -62,7 +62,8 @@
 
 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <!--[if IE]><meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'><![endif]-->
+    <!--[if IE]>
+    <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'><![endif]-->
     <title>{% block title %}Page Title{% endblock %}</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@@ -77,918 +78,943 @@
 
     {% with version="2.0.4" %}
 
-    <link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/assets/finalBase/finalBase.css' %}">
+        <link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/assets/finalBase/finalBase.css' %}">
 
-    <link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/assets/finalBase/finalBaseTheme.css' %}">
+        <link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/assets/finalBase/finalBaseTheme.css' %}">
 
-    <link rel="stylesheet" type="text/css" href="/static/baseTemplate/assets/themes/admin/layout.css">
-    <link rel="stylesheet" type="text/css" href="/static/baseTemplate/assets/themes/admin/color-schemes/default.css">
-    <link rel="stylesheet" type="text/css"
-          href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css">
-    <link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/custom-js/pnotify.custom.min.css' %}">
-    <link rel="stylesheet" type="text/css" href="{% static 'websiteFunctions/websiteFunctions.css' %}">
-    <link rel="stylesheet" type="text/css" href="https://www.jsdelivr.com/package/npm/fontawesome">
-    <link rel="icon" type="image/png" href="{% static 'baseTemplate/assets/finalBase/favicon.png' %}">
-    <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet" />
-    {% block styles %}
-    {% endblock %}
+        <link rel="stylesheet" type="text/css" href="/static/baseTemplate/assets/themes/admin/layout.css">
+        <link rel="stylesheet" type="text/css"
+              href="/static/baseTemplate/assets/themes/admin/color-schemes/default.css">
+        <link rel="stylesheet" type="text/css"
+              href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.css">
+        <link rel="stylesheet" type="text/css" href="{% static 'baseTemplate/custom-js/pnotify.custom.min.css' %}">
+        <link rel="stylesheet" type="text/css" href="{% static 'websiteFunctions/websiteFunctions.css' %}">
+        <link rel="stylesheet" type="text/css" href="https://www.jsdelivr.com/package/npm/fontawesome">
+        <link rel="icon" type="image/png" href="{% static 'baseTemplate/assets/finalBase/favicon.png' %}">
+        <link href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" rel="stylesheet"/>
+        {% block styles %}
+        {% endblock %}
 
-    <script type="text/javascript" src="{% static 'baseTemplate/assets/js-core/jquery-core.min.js' %}"></script>
-    <script type="text/javascript">
-        $(window).load(function () {
-            setTimeout(function () {
-                $('#loading').fadeOut(400, "linear");
-            }, 300);
-        });
-    </script>
-    <script src="https://cdn.jsdelivr.net/npm/flot-charts@0.8.3/jquery.flot.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/jquery.flot@0.8.3/jquery.flot.time.js"></script>
+        <script type="text/javascript" src="{% static 'baseTemplate/assets/js-core/jquery-core.min.js' %}"></script>
+        <script type="text/javascript">
+            $(window).load(function () {
+                setTimeout(function () {
+                    $('#loading').fadeOut(400, "linear");
+                }, 300);
+            });
+        </script>
+        <script src="https://cdn.jsdelivr.net/npm/flot-charts@0.8.3/jquery.flot.min.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/jquery.flot@0.8.3/jquery.flot.time.js"></script>
 
-    {% block header_scripts %}
-    {% endblock %}
+        {% block header_scripts %}
+        {% endblock %}
 
-    <!-- JS Ends -->
+        <!-- JS Ends -->
 
 
-</head>
+        </head>
 
 
-<body>
-<div id="sb-site">
+        <body>
+        <div id="sb-site">
 
 
-    <!------- ng-controller="systemStatusInfo" ------------>
+        <!------- ng-controller="systemStatusInfo" ------------>
 
 
-    <div class="sb-slidebar bg-black sb-right sb-style-overlay">
-        <div class="scrollable-content scrollable-slim-sidebar">
-            <div class="pad15A">
+        <div class="sb-slidebar bg-black sb-right sb-style-overlay">
+            <div class="scrollable-content scrollable-slim-sidebar">
+                <div class="pad15A">
 
 
-                <div class="clear"></div>
+                    <div class="clear"></div>
 
 
-                <div ng-controller="systemStatusInfo" id="sidebar-toggle-3" class="collapse in">
+                    <div ng-controller="systemStatusInfo" id="sidebar-toggle-3" class="collapse in">
 
-                    <ul class="progress-box">
-                        <li>
+                        <ul class="progress-box">
+                            <li>
 
-                            <div class="progress-title">
-                                {% trans "CPU Usage" %}
-                                <b>{$ cpuUsage $}%</b>
-                            </div>
-                            <div class="progressbar-small progressbar" data-value="{$ cpuUsage $}">
-                                <div class="progressbar-value bg-yellow tooltip-button" title="{$ cpuUsage $}%">
+                                <div class="progress-title">
+                                    {% trans "CPU Usage" %}
+                                    <b>{$ cpuUsage $}%</b>
                                 </div>
-                            </div>
-                        </li>
-                        <li>
-                            <b class="pull-right">{$ ramUsage $}%</b>
-                            <div class="progress-title">
-                                {% trans "Ram Usage" %}
-
-                            </div>
-                            <div class="progressbar-small progressbar" data-value="{$ ramUsage $}">
-                                <div class="progressbar-value bg-red tooltip-button" title="{$ ramUsage $}%"></div>
-                            </div>
-                        </li>
-                        <li>
-                            <div class="progress-title">
-                                {% trans "Disk Usage" %}
-                                <b>{$ diskUsage $}%</b>
-                            </div>
-                            <div class="progressbar" data-value="{$ diskUsage $}">
-                                <div class="progressbar-value bg-green">
-                                    <div class="progress-label">{$ diskUsage $}%</div>
+                                <div class="progressbar-small progressbar" data-value="{$ cpuUsage $}">
+                                    <div class="progressbar-value bg-yellow tooltip-button" title="{$ cpuUsage $}%">
+                                    </div>
                                 </div>
-                            </div>
-                        </li>
-                    </ul>
+                            </li>
+                            <li>
+                                <b class="pull-right">{$ ramUsage $}%</b>
+                                <div class="progress-title">
+                                    {% trans "Ram Usage" %}
+
+                                </div>
+                                <div class="progressbar-small progressbar" data-value="{$ ramUsage $}">
+                                    <div class="progressbar-value bg-red tooltip-button" title="{$ ramUsage $}%"></div>
+                                </div>
+                            </li>
+                            <li>
+                                <div class="progress-title">
+                                    {% trans "Disk Usage" %}
+                                    <b>{$ diskUsage $}%</b>
+                                </div>
+                                <div class="progressbar" data-value="{$ diskUsage $}">
+                                    <div class="progressbar-value bg-green">
+                                        <div class="progress-label">{$ diskUsage $}%</div>
+                                    </div>
+                                </div>
+                            </li>
+                        </ul>
+
+                    </div>
+
+                    <div class="clear"></div>
 
                 </div>
-
-                <div class="clear"></div>
-
             </div>
         </div>
-    </div>
 
 
-    <div id="loading">
-        <div class="spinner">
-            <div class="bounce1"></div>
-            <div class="bounce2"></div>
-            <div class="bounce3"></div>
+        <div id="loading">
+            <div class="spinner">
+                <div class="bounce1"></div>
+                <div class="bounce2"></div>
+                <div class="bounce3"></div>
+            </div>
         </div>
-    </div>
 
-    <div id="page-wrapper">
-        <div id="page-header" class="bg-gradient-9">
-            <div id="mobile-navigation">
-                <button id="nav-toggle" class="collapsed" data-toggle="collapse" data-target="#page-sidebar">
-                    <span></span></button>
-                <a href="{% url "index" %}" class="logo-content-small" title="{% trans 'CyberPanel' %}"></a>
-            </div>
-            <div id="header-logo" class="logo-bg">
-                <a href="{% url "index" %}" class="logo-content-big" title="{% trans 'CyberPanel' %}">
-                    Cyber <i>Panel</i>
-                    <span>{% trans "Web Hosting Control Panel" %}</span>
-                </a>
-                <a href="{% url "index" %}" class="logo-content-small" title="{% trans 'CyberPanel' %}">
-                    Cyber <i>Panel</i>
-                    <span>{% trans "Web Hosting Control Panel" %}</span>
-                </a>
-                <a id="close-sidebar" href="#" title="{% trans 'Close sidebar' %}">
-                    <i class="glyph-icon icon-angle-left"></i>
-                </a>
-            </div>
-            <div id="header-nav-left">
-                <div ng-controller="adminController" class="user-account-btn dropdown">
-                    <a href="#" title="{% trans 'My Account' %}" class="user-profile clearfix" data-toggle="dropdown">
-                        <img width="28" src="{% static 'baseTemplate/assets/image-resources/gravatar.png' %}"
-                             alt="Profile image">
-                        <span>{$ currentAdmin $}</span>
-                        <i class="glyph-icon icon-angle-down"></i>
+        <div id="page-wrapper">
+            <div id="page-header" class="bg-gradient-9">
+                <div id="mobile-navigation">
+                    <button id="nav-toggle" class="collapsed" data-toggle="collapse" data-target="#page-sidebar">
+                        <span></span></button>
+                    <a href="{% url "index" %}" class="logo-content-small" title="{% trans 'CyberPanel' %}"></a>
+                </div>
+                <div id="header-logo" class="logo-bg">
+                    <a href="{% url "index" %}" class="logo-content-big" title="{% trans 'CyberPanel' %}">
+                        Cyber <i>Panel</i>
+                        <span>{% trans "Web Hosting Control Panel" %}</span>
                     </a>
-                    <div class="dropdown-menu float-left">
-                        <div class="box-sm">
-                            <div class="login-box clearfix">
-                                <div class="user-img">
-                                    <a href="#" title="{% trans '' %}" class="change-img">Change photo</a>
-                                    <img src="{% static 'baseTemplate/assets/image-resources/gravatar.png' %}" alt="">
-                                </div>
-                                <div class="user-info">
+                    <a href="{% url "index" %}" class="logo-content-small" title="{% trans 'CyberPanel' %}">
+                        Cyber <i>Panel</i>
+                        <span>{% trans "Web Hosting Control Panel" %}</span>
+                    </a>
+                    <a id="close-sidebar" href="#" title="{% trans 'Close sidebar' %}">
+                        <i class="glyph-icon icon-angle-left"></i>
+                    </a>
+                </div>
+                <div id="header-nav-left">
+                    <div ng-controller="adminController" class="user-account-btn dropdown">
+                        <a href="#" title="{% trans 'My Account' %}" class="user-profile clearfix"
+                           data-toggle="dropdown">
+                            <img width="28" src="{% static 'baseTemplate/assets/image-resources/gravatar.png' %}"
+                                 alt="Profile image">
+                            <span>{$ currentAdmin $}</span>
+                            <i class="glyph-icon icon-angle-down"></i>
+                        </a>
+                        <div class="dropdown-menu float-left">
+                            <div class="box-sm">
+                                <div class="login-box clearfix">
+                                    <div class="user-img">
+                                        <a href="#" title="{% trans '' %}" class="change-img">Change photo</a>
+                                        <img src="{% static 'baseTemplate/assets/image-resources/gravatar.png' %}"
+                                             alt="">
+                                    </div>
+                                    <div class="user-info">
                             <span>
                                 {$ currentAdmin $}
                                 <i>{$ admin_type $}</i>
                             </span>
-                                    <a href="{% url 'modifyUsers' %}"
-                                       title="{% trans 'Edit profile' %}">{% trans "Edit profile" %}</a>
-                                    <a href="{% url 'viewProfile' %}"
-                                       title="{% trans 'View Profile' %}">{% trans "View Profile" %}</a>
+                                        <a href="{% url 'modifyUsers' %}"
+                                           title="{% trans 'Edit profile' %}">{% trans "Edit profile" %}</a>
+                                        <a href="{% url 'viewProfile' %}"
+                                           title="{% trans 'View Profile' %}">{% trans "View Profile" %}</a>
+                                    </div>
+                                </div>
+                                <div class="divider"></div>
+                                <div class="pad5A button-pane button-pane-alt text-center">
+                                    <a href="{% url 'logout' %}" class="btn display-block font-normal btn-danger">
+                                        <i class="glyph-icon icon-power-off"></i>
+                                        {% trans "Logout" %}
+                                    </a>
                                 </div>
-                            </div>
-                            <div class="divider"></div>
-                            <div class="pad5A button-pane button-pane-alt text-center">
-                                <a href="{% url 'logout' %}" class="btn display-block font-normal btn-danger">
-                                    <i class="glyph-icon icon-power-off"></i>
-                                    {% trans "Logout" %}
-                                </a>
                             </div>
                         </div>
                     </div>
-                </div>
-            </div><!-- #header-nav-left -->
+                </div><!-- #header-nav-left -->
 
 
-            <div ng-controller="loadAvg" id="header-nav-right">
+                <div ng-controller="loadAvg" id="header-nav-right">
 
-                <a class="hide-on-phone" style="background-color: none;width: 33px" href="#" class="hdr-btn"
-                   title="{% trans 'CPU Load Average' %}" data-placement="bottom">
-                    <span class="badge bg-yellow">{$ one $}</span>
-                </a>
-
-                <a class="hide-on-phone" style="background-color: none;width: 33px" href="#" class="hdr-btn"
-                   title="{% trans 'CPU Load Average' %}" data-placement="bottom">
-                    <span class="badge bg-yellow">{$ two $}</span>
-                </a>
-
-                <a class="hide-on-phone" style="background-color: none;width: 33px" href="#" class="hdr-btn"
-                   title="{% trans 'CPU Load Average' %}" data-placement="bottom">
-                    <span class="badge bg-yellow">{$ three $}</span>
-                </a>
-
-                <div class="dropdown" id="dashnav-btn">
-                    <a href="#" data-toggle="dropdown" data-placement="bottom"
-                       class="popover-button-header tooltip-button" title="{% trans 'Dashboard Quick Menu' %}">
-                        <i class="glyph-icon icon-linecons-cog"></i>
+                    <a class="hide-on-phone" style="background-color: none;width: 33px" href="#" class="hdr-btn"
+                       title="{% trans 'CPU Load Average' %}" data-placement="bottom">
+                        <span class="badge bg-yellow">{$ one $}</span>
                     </a>
-                    <div class="dropdown-menu float-right">
-                        <div class="box-sm">
-                            <div class="pad5T pad5B pad10L pad10R dashboard-buttons clearfix">
-                                <a href="{% url 'loadWebsitesHome' %}"
-                                   class="btn vertical-button remove-border btn-info" title="{% trans '' %}">
+
+                    <a class="hide-on-phone" style="background-color: none;width: 33px" href="#" class="hdr-btn"
+                       title="{% trans 'CPU Load Average' %}" data-placement="bottom">
+                        <span class="badge bg-yellow">{$ two $}</span>
+                    </a>
+
+                    <a class="hide-on-phone" style="background-color: none;width: 33px" href="#" class="hdr-btn"
+                       title="{% trans 'CPU Load Average' %}" data-placement="bottom">
+                        <span class="badge bg-yellow">{$ three $}</span>
+                    </a>
+
+                    <div class="dropdown" id="dashnav-btn">
+                        <a href="#" data-toggle="dropdown" data-placement="bottom"
+                           class="popover-button-header tooltip-button" title="{% trans 'Dashboard Quick Menu' %}">
+                            <i class="glyph-icon icon-linecons-cog"></i>
+                        </a>
+                        <div class="dropdown-menu float-right">
+                            <div class="box-sm">
+                                <div class="pad5T pad5B pad10L pad10R dashboard-buttons clearfix">
+                                    <a href="{% url 'loadWebsitesHome' %}"
+                                       class="btn vertical-button remove-border btn-info" title="{% trans '' %}">
                             <span class="glyph-icon icon-separator-vertical pad0A medium">
                                 <i class="glyph-icon icon-dashboard opacity-80 font-size-20"></i>
                             </span>
-                                    {% trans "Websites" %}
-                                </a>
-                                <a href="{% url 'packagesHome' %}" class="btn vertical-button remove-border btn-danger"
-                                   title="{% trans '' %}">
+                                        {% trans "Websites" %}
+                                    </a>
+                                    <a href="{% url 'packagesHome' %}"
+                                       class="btn vertical-button remove-border btn-danger"
+                                       title="{% trans '' %}">
                             <span class="glyph-icon icon-separator-vertical pad0A medium">
                                 <i class="glyph-icon icon-tags opacity-80 font-size-20"></i>
                             </span>
-                                    {% trans "Packages" %}
-                                </a>
-                                <a href="{% url 'dnsHome' %}" class="btn vertical-button remove-border btn-purple"
-                                   title="{% trans '' %}">
+                                        {% trans "Packages" %}
+                                    </a>
+                                    <a href="{% url 'dnsHome' %}" class="btn vertical-button remove-border btn-purple"
+                                       title="{% trans '' %}">
                             <span class="glyph-icon icon-separator-vertical pad0A medium">
                                 <i class="glyph-icon icon-fire opacity-80 font-size-20"></i>
                             </span>
-                                    {% trans "DNS" %}
-                                </a>
-                                <a href="{% url 'loadFTPHome' %}" class="btn vertical-button remove-border btn-azure"
-                                   title="{% trans '' %}">
+                                        {% trans "DNS" %}
+                                    </a>
+                                    <a href="{% url 'loadFTPHome' %}"
+                                       class="btn vertical-button remove-border btn-azure"
+                                       title="{% trans '' %}">
                             <span class="glyph-icon icon-separator-vertical pad0A medium">
                                 <i class="glyph-icon icon-bar-chart-o opacity-80 font-size-20"></i>
                             </span>
-                                    {% trans "FTP" %}
-                                </a>
-                                <a href="{% url 'loadTuningHome' %}"
-                                   class="btn vertical-button remove-border btn-yellow" title="{% trans '' %}">
+                                        {% trans "FTP" %}
+                                    </a>
+                                    <a href="{% url 'loadTuningHome' %}"
+                                       class="btn vertical-button remove-border btn-yellow" title="{% trans '' %}">
                             <span class="glyph-icon icon-separator-vertical pad0A medium">
                                 <i class="glyph-icon icon-laptop opacity-80 font-size-20"></i>
                             </span>
-                                    {% trans "Tuning" %}
-                                </a>
-                                <a href="{% url 'serverStatusHome' %}"
-                                   class="btn vertical-button remove-border btn-warning" title="{% trans '' %}">
+                                        {% trans "Tuning" %}
+                                    </a>
+                                    <a href="{% url 'serverStatusHome' %}"
+                                       class="btn vertical-button remove-border btn-warning" title="{% trans '' %}">
                             <span class="glyph-icon icon-separator-vertical pad0A medium">
                                 <i class="glyph-icon icon-code opacity-80 font-size-20"></i>
                             </span>
-                                    {% trans "Status" %}
-                                </a>
+                                        {% trans "Status" %}
+                                    </a>
+
+                                </div>
 
                             </div>
-
                         </div>
                     </div>
+                    <a class="header-btn" id="logout-btn" href="{% url 'logout' %}" title="{% trans 'Logout' %}">
+                        <i class="glyph-icon icon-power-off"></i>
+                    </a>
+
+
+                </div><!-- #header-nav-right -->
+
+            </div>
+            <div id="page-sidebar">
+                <div class="scroll-sidebar">
+
+
+                    <ul id="sidebar-menu">
+                        <li class="header"><span>{% trans "Overview" %}</span></li>
+                        <li>
+                            <a href="#" title="{% trans 'Server IP Address' %}">
+                                <i class="glyph-icon tooltip-button icon-laptop" title="{% trans 'Server IP Address' %}"
+                                   data-original-title=".icon-laptop"></i>
+                                <span style="color: #db6868;font-weight: bold;" id="serverIPAddress"></span>
+                            </a>
+                            <a href="{% url 'index' %}" title="{% trans 'Dashboard' %}">
+                                <i class="glyph-icon icon-dashboard"></i>
+                                <span>{% trans "Dashboard" %}</span>
+                            </a>
+                            <a class="versionManagement" href="{% url 'versionManagment' %}"
+                               title="{% trans 'Version Management' %}">
+                                <i class="glyph-icon tooltip-button icon-info"
+                                   title="{% trans 'Version Management' %}" data-original-title=".icon-cloud-upload"
+                                   aria-describedby="tooltip896208"></i>
+                                <span>{% trans "Version Management" %}</span>
+                            </a>
+                            <a class="versionManagement" href="https://platform.cyberpanel.net"
+                               title="{% trans 'Connect' %}">
+                                <i class="glyph-icon tooltip-button icon-link" title="{% trans 'Connect' %}"
+                                   data-original-title=".icon-cloud-upload" aria-describedby="tooltip896208"></i>
+                                <span>{% trans "Connect" %}</span>
+                            </a>
+                        </li>
+                        <li class="divider"></li>
+                        <li class="header"><span>{% trans "Main" %}</span></li>
+
+                        <li>
+                            <a href="{% url 'loadUsersHome' %}" title="{% trans 'Users' %}">
+                                <i class="glyph-icon icon-users" title="{% trans 'Users' %}"></i>
+                                <span>{% trans "Users" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'viewProfile' %}"
+                                           title="{% trans 'View Profile' %}"><span>{% trans "View Profile" %}</span></a>
+                                    </li>
+                                    {% if admin or createNewUser %}
+
+                                        <li><a href="{% url 'createUser' %}"
+                                               title="{% trans 'Create New User' %}"><span>{% trans "Create New User" %}</span></a>
+                                        </li>
+
+                                    {% endif %}
+                                    {% if admin or listUsers %}
+                                        <li><a href="{% url 'listUsers' %}"
+                                                                 title="{% trans 'List Users' %}"><span>{% trans "List Users" %}</span></a>
+                                        </li>
+                                    {% endif %}
+                                    <li><a href="{% url 'modifyUsers' %}"
+                                           title="{% trans 'Modify User' %}"><span>{% trans "Modify User" %}</span></a>
+                                    </li>
+                                    {% if admin or resellerCenter %}
+                                    <li><a href="{% url 'resellerCenter' %}"
+                                                                  title="{% trans 'Reseller Center' %}"><span>{% trans "Reseller Center" %}</span></a>
+                                    </li>
+                                {% endif %}
+                                    <li class="serverACL"><a href="{% url 'createNewACL' %}"
+                                                             title="{% trans 'Create New ACL' %}"><span>{% trans "Create New ACL" %}</span></a>
+                                    </li>
+                                    <li class="serverACL"><a href="{% url 'deleteACL' %}"
+                                                             title="{% trans 'Delete ACL' %}"><span>{% trans "Delete ACL" %}</span></a>
+                                    </li>
+                                    <li class="serverACL"><a href="{% url 'modifyACL' %}"
+                                                             title="{% trans 'Modify ACL' %}"><span>{% trans "Modify ACL" %}</span></a>
+                                    </li>
+                                    <li class="serverACL"><a href="{% url 'apiAccess' %}"
+                                                             title="{% trans 'API Access' %}"><span>{% trans "API Access" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li>
+                            <a href="{% url 'loadWebsitesHome' %}" title="{% trans 'Websites' %}">
+                                <div class="glyph-icon icon-globe" title="{% trans 'Websites' %}"></div>
+                                <span>{% trans "Websites" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li class="createWebsite"><a href="{% url 'createWebsite' %}"
+                                                                 title="{% trans 'Create Website' %}"><span>{% trans "Create Website" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'listWebsites' %}"
+                                           title="{% trans 'List Websites' %}"><span>{% trans "List Websites" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'listChildDomains' %}"
+                                           title="{% trans 'List Child Domains' %}"><span>{% trans "List Child Domains" %}</span></a>
+                                    </li>
+                                    <li class="modifyWebsite"><a href="{% url 'modifyWebsite' %}"
+                                                                 title="{% trans 'Modify Website' %}"><span>{% trans "Modify Website" %}</span></a>
+                                    </li>
+                                    <li class="suspendWebsite"><a href="{% url 'siteState' %}"
+                                                                  title="{% trans 'Suspend/Unsuspend' %}"><span>{% trans "Suspend/Unsuspend" %}</span></a>
+                                    </li>
+                                    <li class="deleteWebsite"><a href="{% url 'deleteWebsite' %}"
+                                                                 title="{% trans 'Delete Website' %}"><span>{% trans "Delete Website" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+                        <li>
+                            <a id="packageHome" href="{% url 'packagesHome' %}" title="{% trans 'Packages' %}">
+                                <i class="glyph-icon icon-cubes"></i>
+                                <span>{% trans "Packages" %}</span>
+                            </a>
+                            <div id="packageSub" class="sidebar-submenu">
+
+                                <ul>
+                                    <li class="createPackage"><a href="{% url 'createPackage' %}"
+                                                                 title="{% trans 'Create Package' %}"><span>{% trans "Create Package" %}</span></a>
+                                    </li>
+                                    <li class="listPackages"><a href="{% url 'listPackages' %}"
+                                                                title="{% trans 'List Packages' %}"><span>{% trans "List Packages" %}</span></a>
+                                    </li>
+                                    <li class="deletePackage"><a href="{% url 'deletePackage' %}"
+                                                                 title="{% trans 'Delete Package' %}"><span>{% trans "Delete Package" %}</span></a>
+                                    </li>
+                                    <li class="modifyPackage"><a href="{% url 'modifyPackage' %}"
+                                                                 title="{% trans 'Modify Package' %}"><span>{% trans "Modify Package" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li>
+                            <a title="{% trans 'Databases' %}">
+                                <i class="glyph-icon icon-database" title="{% trans 'Databases' %}"></i>
+                                <span>{% trans "Databases" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li class="createDatabase"><a href="{% url 'createDatabase' %}"
+                                                                  title="{% trans 'Create Database' %}"><span>{% trans "Create Database" %}</span></a>
+                                    </li>
+                                    <li class="deleteDatabase"><a href="{% url 'deleteDatabase' %}"
+                                                                  title="{% trans 'Delete Database' %}"><span>{% trans "Delete Database" %}</span></a>
+                                    </li>
+                                    <li class="listDatabases"><a href="{% url 'listDBs' %}"
+                                                                 title="{% trans 'List Databases' %}"><span>{% trans "List Databases" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'phpMyAdmin' %}"
+                                           title="{% trans 'PHPMYAdmin' %}"><span>{% trans "PHPMYAdmin" %}</span></a>
+                                    </li>
+                                    <!----<li><a href="{% url 'modifyPackage' %}" title="Change Password"><span>Change Password</span></a></li>--->
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="dnsAsWhole">
+                            <a title="{% trans 'DNS' %}">
+                                <i class="glyph-icon icon-sitemap"></i>
+                                <span>{% trans "DNS" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li class="createNameServer"><a href="{% url 'createNameserver' %}"
+                                                                    title="{% trans 'Create Nameserver' %}"><span>{% trans "Create Nameserver" %}</span></a>
+                                    </li>
+                                    <li class="serverACL"><a href="{% url 'configureDefaultNameServers' %}"
+                                                             title="{% trans 'Configure Default Nameservers' %}"><span>{% trans "Config Default Nameservers" %}</span></a>
+                                    </li>
+                                    <li class="createDNSZone"><a href="{% url 'createDNSZone' %}"
+                                                                 title="{% trans 'Create DNS Zone' %}"><span>{% trans "Create DNS Zone" %}</span></a>
+                                    </li>
+                                    <li class="deleteZone"><a href="{% url 'deleteDNSZone' %}"
+                                                              title="{% trans 'Delete Zone' %}"><span>{% trans "Delete Zone" %}</span></a>
+                                    </li>
+                                    <li class="addDeleteRecords"><a href="{% url 'addDeleteDNSRecords' %}"
+                                                                    title="{% trans 'Add/Delete Records' %}"><span>{% trans "Add/Delete Records" %}</span></a>
+                                    </li>
+                                    <li class="addDeleteRecords"><a href="{% url 'addDeleteDNSRecordsCloudFlare' %}"
+                                                                    title="{% trans 'CloudFlare' %}"><span>{% trans "CloudFlare" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="emailAsWhole">
+                            <a href="{% url 'loadEmailHome' %}" title="{% trans 'Email' %}">
+                                <i class="glyph-icon icon-paper-plane"></i>
+                                <span>{% trans "Email" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li class="createEmail"><a href="{% url 'createEmailAccount' %}"
+                                                               title="{% trans 'Create Email Account' %}"><span>{% trans "Create Email" %}</span></a>
+                                    </li>
+                                    <li class="listEmails"><a href="{% url 'listEmails' %}"
+                                                              title="{% trans 'List Emails' %}"><span>{% trans "List Emails" %}</span></a>
+                                    </li>
+                                    <li class="deleteEmail"><a href="{% url 'deleteEmailAccount' %}"
+                                                               title="{% trans 'Delete Email Account' %}"><span>{% trans "Delete Email" %}</span></a>
+                                    </li>
+                                    <li class="emailForwarding"><a href="{% url 'emailForwarding' %}"
+                                                                   title="{% trans 'Email Forwarding' %}"><span>{% trans "Email Forwarding" %}</span></a>
+                                    </li>
+                                    <li class="changeEmailPassword"><a href="{% url 'changeEmailAccountPassword' %}"
+                                                                       title="{% trans 'Change Password' %}"><span>{% trans "Change Password" %}</span></a>
+                                    </li>
+                                    <li class="dkimManager"><a href="{% url 'dkimManager' %}"
+                                                               title="{% trans 'DKIM Manager' %}"><span>{% trans "DKIM Manager" %}</span></a>
+                                    </li>
+                                    <li><a href="/rainloop/index.php" title="{% trans 'Access Webmail' %}"
+                                           target="_blank"><span>{% trans "Access Webmail" %}</span></a></li>
+
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="ftpAsWhole">
+                            <a href="{% url 'packagesHome' %}" title="{% trans 'FTP' %}">
+                                <i class="glyph-icon icon-cloud-upload"></i>
+                                <span>{% trans "FTP" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li class="createFTPAccount"><a href="{% url 'createFTPAccount' %}"
+                                                                    title="{% trans 'Create FTP Account' %}"><span>{% trans "Create FTP Account" %}</span></a>
+                                    </li>
+                                    <li class="deleteFTPAccount"><a href="{% url 'deleteFTPAccount' %}"
+                                                                    title="{% trans 'Delete FTP Account' %}"><span>{% trans "Delete FTP Account" %}</span></a>
+                                    </li>
+                                    <li class="listFTPAccounts"><a href="{% url 'listFTPAccounts' %}"
+                                                                   title="{% trans 'List FTP Accounts' %}"><span>{% trans "List FTP Accounts" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li>
+                            <a href="{% url 'loadBackupHome' %}" title="{% trans 'Back up' %}">
+                                <i class="glyph-icon tooltip-button icon-copy" title=".icon-folder"></i>
+                                <span>{% trans "Back up" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li class="createBackup"><a href="{% url 'backupSite' %}"
+                                                                title="{% trans 'Create Back up' %}"><span>{% trans "Create Back up" %}</span></a>
+                                    </li>
+                                    <li class="restoreBackup"><a href="{% url 'restoreSite' %}"
+                                                                 title="{% trans 'Restore Back up' %}"><span>{% trans "Restore Back up" %}</span></a>
+                                    </li>
+                                    <li class="addDeleteDestinations"><a href="{% url 'backupDestinations' %}"
+                                                                         title="{% trans 'Add Destination' %}"><span>{% trans "Add/Delete Destination" %}</span></a>
+                                    </li>
+                                    <li class="scheDuleBackups"><a href="{% url 'scheduleBackup' %}"
+                                                                   title="{% trans 'Schedule Back up' %}"><span>{% trans "Schedule Back up" %}</span></a>
+                                    </li>
+                                    <li class="createBackup"><a href="{% url 'gDrive' %}"
+                                                                title="{% trans 'Setup Google Drive' %}"><span>{% trans "Setup Google Drive" %}</span></a>
+                                    </li>
+                                    <li class="remoteBackups"><a href="{% url 'remoteBackups' %}"
+                                                                 title="{% trans 'Remote Back ups' %}"><span>{% trans "Remote Back ups" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+
+                        <li>
+                            <a href="{% url 'loadBackupHome' %}" title="{% trans 'Incremental Back up - Beta' %}">
+                                <i class="glyph-icon tooltip-button icon-save" title="Incremental Back up"></i>
+                                <span>{% trans "Incremental Back up" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li class="createBackup"><a href="{% url 'createBackupInc' %}"
+                                                                title="{% trans 'Create Back up' %}"><span>{% trans "Create/Restore Back up" %}</span></a>
+                                    </li>
+                                    <li class="restoreBackup"><a href="{% url 'backupDestinationsInc' %}"
+                                                                 title="{% trans 'Restore Back up' %}"><span>{% trans "Add/Remove Destinations" %}</span></a>
+                                    </li>
+                                    <li class="restoreBackup"><a href="{% url 'scheduleBackupsInc' %}"
+                                                                 title="{% trans 'Schedule Back ups' %}"><span>{% trans "Schedule Back ups" %}</span></a>
+                                    </li>
+                                    <li class="remoteBackups"><a href="{% url 'restoreRemoteBackupsInc' %}"
+                                                                 title="{% trans 'Restore from Remote Server' %}"><span>{% trans "Restore from Remote" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+
+                        <li>
+                            <a href="{% url 'loadSSLHome' %}" title="{% trans 'Back up' %}">
+                                <i class="glyph-icon tooltip-button icon-lock" title="{% trans 'SSL' %}"></i>
+                                <span>{% trans "SSL" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li class="manageSSL"><a href="{% url 'manageSSL' %}"
+                                                             title="{% trans 'Manage SSL' %}"><span>{% trans "Manage SSL" %}</span></a>
+                                    </li>
+                                    <li class="hostnameSSL"><a href="{% url 'sslForHostName' %}"
+                                                               title="{% trans 'Hostname SSL' %}"><span>{% trans "Hostname SSL" %}</span></a>
+                                    </li>
+                                    <li class="mailServerSSL"><a href="{% url 'sslForMailServer' %}"
+                                                                 title="{% trans 'MailServer SSL' %}"><span>{% trans "MailServer SSL" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="header serverACL"><span>{% trans "Server" %}</span></li>
+
+
+                        <li class="serverACL">
+                            <a href="#" title="{% trans 'Terminal' %}">
+                                <i class="glyph-icon icon-linecons-fire"></i>
+                                <span>{% trans "Web Terminal" %}</span>
+                                <span class="bs-label badge-yellow">{% trans "NEW" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'terminal' %}"
+                                           title="{% trans 'Web Based Terminal' %}"><span>{% trans "Terminal" %}</span></a>
+                                    </li>
+                                </ul>
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="serverACL">
+                            <a href="#" title="{% trans 'CloudLinux' %}">
+                                <i class="glyph-icon icon-linecons-fire"></i>
+                                <span>{% trans "CloudLinux" %}</span>
+                                <span class="bs-label badge-yellow">{% trans "NEW" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'CreatePackageCL' %}"
+                                           title="{% trans 'Create Cloud Linux Package' %}"><span>{% trans "Create Package" %}</span></a>
+                                    </li>
+                                </ul>
+                                <ul>
+                                    <li><a href="{% url 'listPackagesCL' %}"
+                                           title="{% trans 'List Cloud Linux Package' %}"><span>{% trans "List Packages" %}</span></a>
+                                    </li>
+                                </ul>
+                                <ul>
+                                    <li><a href="{% url 'monitorUsage' %}"
+                                           title="{% trans 'Monitor Usage of your Websites' %}"><span>{% trans "Monitor Usage" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+
+                        <li class="serverACL">
+                            <a href="#" title="{% trans 'Containerization' %}">
+                                <i class="glyph-icon icon-linecons-fire"></i>
+                                <span>{% trans "Containerization" %}</span>
+                                <span class="bs-label badge-yellow">{% trans "NEW" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'cHome' %}"
+                                           title="{% trans 'Create Website Limits' %}"><span>{% trans "Create Limits" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="serverACL">
+                            <a href="#" title="{% trans 'Docker' %}">
+                                <i class="glyph-icon icon-cogs"></i>
+                                <span>{% trans "Docker Manager" %}</span>
+                                <span class="bs-label badge-yellow">{% trans "NEW" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'manageImages' %}"
+                                           title="{% trans 'Manage Docker Images' %}"><span>{% trans "Manage Images" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'listContainers' %}"
+                                           title="{% trans 'Manage Docker Containers' %}"><span>{% trans "Manage Containers" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'containerImage' %}"
+                                           title="{% trans 'Create New Docker Container' %}"><span>{% trans "Create New Container" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="serverACL">
+                            <a href="#" title="{% trans 'Tuning' %}">
+                                <i class="glyph-icon icon-adjust"></i>
+                                <span>{% trans "Tuning" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'liteSpeedTuning' %}"
+                                           title="{% trans 'LiteSpeed Tuning' %}"><span>{% trans "LiteSpeed Tuning" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'phpTuning' %}"
+                                           title="{% trans 'PHP Tuning' %}"><span>{% trans "PHP Tuning" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="serverACL">
+                            <a href="#" title="{% trans 'Server Status' %}">
+                                <i class="glyph-icon icon-cog"></i>
+                                <span>{% trans "Server Status" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'topProcesses' %}"
+                                           title="{% trans 'Top Processes' %}"><span>{% trans "Top Processes" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'litespeedStatus' %}"
+                                           title="{% trans 'LiteSpeed Status' %}"><span>{% trans "LiteSpeed Status" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'cyberCPMainLogFile' %}"
+                                           title="{% trans 'CyberPanel Main Log File' %}"><span>{% trans "CyberPanel Main Log File" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'services' %}"
+                                           title="{% trans 'Services Status' %}"><span>{% trans "Services Status" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'CyberPanelPort' %}"
+                                           title="{% trans 'Change CyberPanel Port' %}"><span>{% trans "Change Port" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'packageManager' %}"
+                                           title="{% trans 'Package Manager' %}"><span>{% trans "Package Manager" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="serverACL">
+                            <a href="{% url 'loadPHPHome' %}" title="{% trans 'PHP' %}">
+                                <i class="glyph-icon icon-code"></i>
+                                <span>{% trans "PHP" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'installExtensions' %}"
+                                           title="{% trans 'Install PHP Extensions' %}"><span>{% trans "Install Extensions" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'editPHPConfigs' %}"
+                                           title="{% trans 'Edit PHP Configs' %}"><span>{% trans "Edit PHP Configs" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="serverACL">
+                            <a href="{% url 'logsHome' %}" title="{% trans 'Server Status' %}">
+                                <i class="glyph-icon icon-file"></i>
+                                <span>{% trans "Logs" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'serverMail' %}"
+                                           title="{% trans 'Server Mail' %}"><span>{% trans "Server Mail" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'accessLogs' %}"
+                                           title="{% trans 'Access Log' %}"><span>{% trans "Access Log" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'errorLogs' %}"
+                                           title="{% trans 'Error Logs' %}"><span>{% trans "Error Logs" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'emaillogs' %}"
+                                           title="{% trans 'Email Logs' %}"><span>{% trans "Email Log" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'ftplogs' %}"
+                                           title="{% trans 'FTP Logs' %}"><span>{% trans "FTP Logs" %}</span></a></li>
+                                    <li><a href="{% url 'modSecAuditLogs' %}"
+                                           title="{% trans 'ModSecurity Audit Logs' %}"><span>{% trans "ModSec Audit Logs" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="serverACL">
+                            <a href="{% url 'securityHome' %}" title="{% trans 'Security' %}">
+                                <i class="glyph-icon icon-shield"></i>
+                                <span>{% trans "Security" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'firewallHome' %}"
+                                           title="{% trans 'Firewall Home' %}"><span>{% trans "Firewall" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'secureSSH' %}"
+                                           title="{% trans 'Secure SSH' %}"><span>{% trans "Secure SSH" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'modSecurity' %}"
+                                           title="{% trans 'ModSecurity Configurations' %}"><span>{% trans "ModSecurity Conf" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'modSecRules' %}"
+                                           title="{% trans 'ModSecurity Rules' %}"><span>{% trans "ModSecurity Rules" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'modSecRulesPacks' %}"
+                                           title="{% trans 'ModSecurity Rules Packs' %}"><span>{% trans "ModSecurity Rules Packs" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'csf' %}"
+                                           title="{% trans 'ConfigServer Security & Firewall (CSF)' %}"><span>{% trans "CSF" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'CageFS' %}"
+                                           title="{% trans 'CageFS Configurations' %}"><span>{% trans "CageFS" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'imunify' %}"
+                                           title="{% trans 'Imunify 360' %}"><span>{% trans "Imunify 360" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'imunifyAV' %}"
+                                           title="{% trans 'ImunifyAV' %}"><span>{% trans "ImunifyAV" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="serverACL emailAsWhole">
+                            <a href="#" title="{% trans 'Mail Settings' %}">
+                                <i class="glyph-icon icon-envelope"></i>
+                                <span>{% trans "Mail Settings" %}</span>
+                                <span class="bs-label badge-yellow">{% trans "NEW" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'mailQueue' %}"
+                                           title="{% trans 'Mail Queue' %}"><span>{% trans "Mail Queue" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'emailPolicyServer' %}"
+                                           title="{% trans 'Email Policy Server' %}"><span>{% trans "Email Policy Server" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'listDomains' %}"
+                                           title="{% trans 'Email Limits' %}"><span>{% trans "Email Limits" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'SpamAssassin' %}"
+                                           title="{% trans 'SpamAssassin Configurations' %}"><span>{% trans "SpamAssassin" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'emailMarketing' %}"
+                                           title="{% trans 'Email Marketing' %}"><span>{% trans "Email Marketing" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'MailScanner' %}"
+                                           title="{% trans 'MailScanner' %}"><span>{% trans "MailScanner" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="serverACL">
+                            <a href="#" title="{% trans 'Manage Services' %}">
+                                <i class="glyph-icon icon-folder-open"></i>
+                                <span>{% trans "Manage Services" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'manageApplications' %}"
+                                           title="{% trans 'Manage Applications' %}"><span>{% trans "Applications" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'managePowerDNS' %}"
+                                           title="{% trans 'Manage PowerDNS' %}"><span>{% trans "Manage PowerDNS" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'managePostfix' %}"
+                                           title="{% trans 'Manage Postfix' %}"><span>{% trans "Manage Postfix" %}</span></a>
+                                    </li>
+                                    <li><a href="{% url 'managePureFtpd' %}"
+                                           title="{% trans 'Manage FTP' %}"><span>{% trans "Manage FTP" %}</span></a>
+                                    </li>
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                        <li class="serverACL">
+                            <a href="#" title="{% trans 'Plugins' %}">
+                                <i class="glyph-icon icon-plug"></i>
+                                <span>{% trans "Plugins" %}</span>
+                            </a>
+                            <div class="sidebar-submenu">
+
+                                <ul>
+                                    <li><a href="{% url 'installed' %}"
+                                           title="{% trans 'Installed Plugins' %}"><span>{% trans "Installed" %}</span></a>
+                                    </li>
+                                    {# pluginsList #}
+                                </ul>
+
+                            </div><!-- .sidebar-submenu -->
+                        </li>
+
+                    </ul><!-- #sidebar-menu -->
+
                 </div>
-                <a class="header-btn" id="logout-btn" href="{% url 'logout' %}" title="{% trans 'Logout' %}">
-                    <i class="glyph-icon icon-power-off"></i>
-                </a>
-
-
-            </div><!-- #header-nav-right -->
-
-        </div>
-        <div id="page-sidebar">
-            <div class="scroll-sidebar">
-
-
-                <ul id="sidebar-menu">
-                    <li class="header"><span>{% trans "Overview" %}</span></li>
-                    <li>
-                        <a href="#" title="{% trans 'Server IP Address' %}">
-                            <i class="glyph-icon tooltip-button icon-laptop" title="{% trans 'Server IP Address' %}"
-                               data-original-title=".icon-laptop"></i>
-                            <span style="color: #db6868;font-weight: bold;" id="serverIPAddress"></span>
-                        </a>
-                        <a href="{% url 'index' %}" title="{% trans 'Dashboard' %}">
-                            <i class="glyph-icon icon-dashboard"></i>
-                            <span>{% trans "Dashboard" %}</span>
-                        </a>
-                        <a class="versionManagement" href="{% url 'versionManagment' %}"
-                           title="{% trans 'Version Management' %}">
-                            <i class="glyph-icon tooltip-button icon-info"
-                               title="{% trans 'Version Management' %}" data-original-title=".icon-cloud-upload"
-                               aria-describedby="tooltip896208"></i>
-                            <span>{% trans "Version Management" %}</span>
-                        </a>
-                        <a class="versionManagement" href="https://platform.cyberpanel.net"
-                           title="{% trans 'Connect' %}">
-                            <i class="glyph-icon tooltip-button icon-link" title="{% trans 'Connect' %}"
-                               data-original-title=".icon-cloud-upload" aria-describedby="tooltip896208"></i>
-                            <span>{% trans "Connect" %}</span>
-                        </a>
-                    </li>
-                    <li class="divider"></li>
-                    <li class="header"><span>{% trans "Main" %}</span></li>
-
-                    <li>
-                        <a href="{% url 'loadUsersHome' %}" title="{% trans 'Users' %}">
-                            <i class="glyph-icon icon-users" title="{% trans 'Users' %}"></i>
-                            <span>{% trans "Users" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'viewProfile' %}"
-                                       title="{% trans 'View Profile' %}"><span>{% trans "View Profile" %}</span></a>
-                                </li>
-                                <li class="createNewUser"><a href="{% url 'createUser' %}"
-                                                             title="{% trans 'Create New User' %}"><span>{% trans "Create New User" %}</span></a>
-                                </li>
-                                <li class="listUsers"><a href="{% url 'listUsers' %}"
-                                                         title="{% trans 'List Users' %}"><span>{% trans "List Users" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'modifyUsers' %}"
-                                       title="{% trans 'Modify User' %}"><span>{% trans "Modify User" %}</span></a></li>
-                                <li class="resellerCenter"><a href="{% url 'resellerCenter' %}"
-                                                              title="{% trans 'Reseller Center' %}"><span>{% trans "Reseller Center" %}</span></a>
-                                </li>
-                                <li class="serverACL"><a href="{% url 'createNewACL' %}"
-                                                         title="{% trans 'Create New ACL' %}"><span>{% trans "Create New ACL" %}</span></a>
-                                </li>
-                                <li class="serverACL"><a href="{% url 'deleteACL' %}"
-                                                         title="{% trans 'Delete ACL' %}"><span>{% trans "Delete ACL" %}</span></a>
-                                </li>
-                                <li class="serverACL"><a href="{% url 'modifyACL' %}"
-                                                         title="{% trans 'Modify ACL' %}"><span>{% trans "Modify ACL" %}</span></a>
-                                </li>
-                                <li class="serverACL"><a href="{% url 'apiAccess' %}"
-                                                         title="{% trans 'API Access' %}"><span>{% trans "API Access" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li>
-                        <a href="{% url 'loadWebsitesHome' %}" title="{% trans 'Websites' %}">
-                            <div class="glyph-icon icon-globe" title="{% trans 'Websites' %}"></div>
-                            <span>{% trans "Websites" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li class="createWebsite"><a href="{% url 'createWebsite' %}"
-                                                             title="{% trans 'Create Website' %}"><span>{% trans "Create Website" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'listWebsites' %}"
-                                       title="{% trans 'List Websites' %}"><span>{% trans "List Websites" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'listChildDomains' %}"
-                                       title="{% trans 'List Child Domains' %}"><span>{% trans "List Child Domains" %}</span></a>
-                                </li>
-                                <li class="modifyWebsite"><a href="{% url 'modifyWebsite' %}"
-                                                             title="{% trans 'Modify Website' %}"><span>{% trans "Modify Website" %}</span></a>
-                                </li>
-                                <li class="suspendWebsite"><a href="{% url 'siteState' %}"
-                                                              title="{% trans 'Suspend/Unsuspend' %}"><span>{% trans "Suspend/Unsuspend" %}</span></a>
-                                </li>
-                                <li class="deleteWebsite"><a href="{% url 'deleteWebsite' %}"
-                                                             title="{% trans 'Delete Website' %}"><span>{% trans "Delete Website" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-                    <li>
-                        <a id="packageHome" href="{% url 'packagesHome' %}" title="{% trans 'Packages' %}">
-                            <i class="glyph-icon icon-cubes"></i>
-                            <span>{% trans "Packages" %}</span>
-                        </a>
-                        <div id="packageSub" class="sidebar-submenu">
-
-                            <ul>
-                                <li class="createPackage"><a href="{% url 'createPackage' %}"
-                                                             title="{% trans 'Create Package' %}"><span>{% trans "Create Package" %}</span></a>
-                                </li>
-                                <li class="listPackages"><a href="{% url 'listPackages' %}"
-                                                            title="{% trans 'List Packages' %}"><span>{% trans "List Packages" %}</span></a>
-                                </li>
-                                <li class="deletePackage"><a href="{% url 'deletePackage' %}"
-                                                             title="{% trans 'Delete Package' %}"><span>{% trans "Delete Package" %}</span></a>
-                                </li>
-                                <li class="modifyPackage"><a href="{% url 'modifyPackage' %}"
-                                                             title="{% trans 'Modify Package' %}"><span>{% trans "Modify Package" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li>
-                        <a title="{% trans 'Databases' %}">
-                            <i class="glyph-icon icon-database" title="{% trans 'Databases' %}"></i>
-                            <span>{% trans "Databases" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li class="createDatabase"><a href="{% url 'createDatabase' %}"
-                                                              title="{% trans 'Create Database' %}"><span>{% trans "Create Database" %}</span></a>
-                                </li>
-                                <li class="deleteDatabase"><a href="{% url 'deleteDatabase' %}"
-                                                              title="{% trans 'Delete Database' %}"><span>{% trans "Delete Database" %}</span></a>
-                                </li>
-                                <li class="listDatabases"><a href="{% url 'listDBs' %}"
-                                                             title="{% trans 'List Databases' %}"><span>{% trans "List Databases" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'phpMyAdmin' %}" title="{% trans 'PHPMYAdmin' %}"><span>{% trans "PHPMYAdmin" %}</span></a></li>
-                                <!----<li><a href="{% url 'modifyPackage' %}" title="Change Password"><span>Change Password</span></a></li>--->
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="dnsAsWhole">
-                        <a title="{% trans 'DNS' %}">
-                            <i class="glyph-icon icon-sitemap"></i>
-                            <span>{% trans "DNS" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li class="createNameServer"><a href="{% url 'createNameserver' %}"
-                                                                title="{% trans 'Create Nameserver' %}"><span>{% trans "Create Nameserver" %}</span></a>
-                                </li>
-                                <li class="serverACL"><a href="{% url 'configureDefaultNameServers' %}"
-                                                         title="{% trans 'Configure Default Nameservers' %}"><span>{% trans "Config Default Nameservers" %}</span></a>
-                                </li>
-                                <li class="createDNSZone"><a href="{% url 'createDNSZone' %}"
-                                                             title="{% trans 'Create DNS Zone' %}"><span>{% trans "Create DNS Zone" %}</span></a>
-                                </li>
-                                <li class="deleteZone"><a href="{% url 'deleteDNSZone' %}"
-                                                          title="{% trans 'Delete Zone' %}"><span>{% trans "Delete Zone" %}</span></a>
-                                </li>
-                                <li class="addDeleteRecords"><a href="{% url 'addDeleteDNSRecords' %}"
-                                                                title="{% trans 'Add/Delete Records' %}"><span>{% trans "Add/Delete Records" %}</span></a>
-                                </li>
-                                <li class="addDeleteRecords"><a href="{% url 'addDeleteDNSRecordsCloudFlare' %}"
-                                                                title="{% trans 'CloudFlare' %}"><span>{% trans "CloudFlare" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="emailAsWhole">
-                        <a href="{% url 'loadEmailHome' %}" title="{% trans 'Email' %}">
-                            <i class="glyph-icon icon-paper-plane"></i>
-                            <span>{% trans "Email" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li class="createEmail"><a href="{% url 'createEmailAccount' %}"
-                                                           title="{% trans 'Create Email Account' %}"><span>{% trans "Create Email" %}</span></a>
-                                </li>
-                                <li class="listEmails"><a href="{% url 'listEmails' %}"
-                                                          title="{% trans 'List Emails' %}"><span>{% trans "List Emails" %}</span></a>
-                                </li>
-                                <li class="deleteEmail"><a href="{% url 'deleteEmailAccount' %}"
-                                                           title="{% trans 'Delete Email Account' %}"><span>{% trans "Delete Email" %}</span></a>
-                                </li>
-                                <li class="emailForwarding"><a href="{% url 'emailForwarding' %}"
-                                                               title="{% trans 'Email Forwarding' %}"><span>{% trans "Email Forwarding" %}</span></a>
-                                </li>
-                                <li class="changeEmailPassword"><a href="{% url 'changeEmailAccountPassword' %}"
-                                                                   title="{% trans 'Change Password' %}"><span>{% trans "Change Password" %}</span></a>
-                                </li>
-                                <li class="dkimManager"><a href="{% url 'dkimManager' %}"
-                                                           title="{% trans 'DKIM Manager' %}"><span>{% trans "DKIM Manager" %}</span></a>
-                                </li>
-                                <li><a href="/rainloop/index.php" title="{% trans 'Access Webmail' %}"
-                                       target="_blank"><span>{% trans "Access Webmail" %}</span></a></li>
-
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="ftpAsWhole">
-                        <a href="{% url 'packagesHome' %}" title="{% trans 'FTP' %}">
-                            <i class="glyph-icon icon-cloud-upload"></i>
-                            <span>{% trans "FTP" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li class="createFTPAccount"><a href="{% url 'createFTPAccount' %}"
-                                                                title="{% trans 'Create FTP Account' %}"><span>{% trans "Create FTP Account" %}</span></a>
-                                </li>
-                                <li class="deleteFTPAccount"><a href="{% url 'deleteFTPAccount' %}"
-                                                                title="{% trans 'Delete FTP Account' %}"><span>{% trans "Delete FTP Account" %}</span></a>
-                                </li>
-                                <li class="listFTPAccounts"><a href="{% url 'listFTPAccounts' %}"
-                                                               title="{% trans 'List FTP Accounts' %}"><span>{% trans "List FTP Accounts" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li>
-                        <a href="{% url 'loadBackupHome' %}" title="{% trans 'Back up' %}">
-                            <i class="glyph-icon tooltip-button icon-copy" title=".icon-folder"></i>
-                            <span>{% trans "Back up" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li class="createBackup"><a href="{% url 'backupSite' %}"
-                                                            title="{% trans 'Create Back up' %}"><span>{% trans "Create Back up" %}</span></a>
-                                </li>
-                                <li class="restoreBackup"><a href="{% url 'restoreSite' %}"
-                                                             title="{% trans 'Restore Back up' %}"><span>{% trans "Restore Back up" %}</span></a>
-                                </li>
-                                <li class="addDeleteDestinations"><a href="{% url 'backupDestinations' %}"
-                                                                     title="{% trans 'Add Destination' %}"><span>{% trans "Add/Delete Destination" %}</span></a>
-                                </li>
-                                <li class="scheDuleBackups"><a href="{% url 'scheduleBackup' %}"
-                                                               title="{% trans 'Schedule Back up' %}"><span>{% trans "Schedule Back up" %}</span></a>
-                                </li>
-                                <li class="createBackup"><a href="{% url 'gDrive' %}"
-                                                                     title="{% trans 'Setup Google Drive' %}"><span>{% trans "Setup Google Drive" %}</span></a>
-                                </li>
-                                <li class="remoteBackups"><a href="{% url 'remoteBackups' %}"
-                                                             title="{% trans 'Remote Back ups' %}"><span>{% trans "Remote Back ups" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-
-                    <li>
-                        <a href="{% url 'loadBackupHome' %}" title="{% trans 'Incremental Back up - Beta' %}">
-                            <i class="glyph-icon tooltip-button icon-copy" title=".icon-folder"></i>
-                            <span>{% trans "Incremental Back up" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li class="createBackup"><a href="{% url 'createBackupInc' %}"
-                                                            title="{% trans 'Create Back up' %}"><span>{% trans "Create/Restore Back up" %}</span></a>
-                                </li>
-                                <li class="restoreBackup"><a href="{% url 'backupDestinationsInc' %}"
-                                                             title="{% trans 'Restore Back up' %}"><span>{% trans "Add/Remove Destinations" %}</span></a>
-                                </li>
-                                <li class="restoreBackup"><a href="{% url 'scheduleBackupsInc' %}"
-                                                             title="{% trans 'Schedule Back ups' %}"><span>{% trans "Schedule Back ups" %}</span></a>
-                                </li>
-                                <li class="remoteBackups"><a href="{% url 'restoreRemoteBackupsInc' %}"
-                                                             title="{% trans 'Restore from Remote Server' %}"><span>{% trans "Restore from Remote" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-
-                    <li>
-                        <a href="{% url 'loadSSLHome' %}" title="{% trans 'Back up' %}">
-                            <i class="glyph-icon tooltip-button icon-lock" title="{% trans 'SSL' %}"></i>
-                            <span>{% trans "SSL" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li class="manageSSL"><a href="{% url 'manageSSL' %}"
-                                                         title="{% trans 'Manage SSL' %}"><span>{% trans "Manage SSL" %}</span></a>
-                                </li>
-                                <li class="hostnameSSL"><a href="{% url 'sslForHostName' %}"
-                                                           title="{% trans 'Hostname SSL' %}"><span>{% trans "Hostname SSL" %}</span></a>
-                                </li>
-                                <li class="mailServerSSL"><a href="{% url 'sslForMailServer' %}"
-                                                             title="{% trans 'MailServer SSL' %}"><span>{% trans "MailServer SSL" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="header serverACL"><span>{% trans "Server" %}</span></li>
-
-
-                    <li class="serverACL">
-                        <a href="#" title="{% trans 'Terminal' %}">
-                            <i class="glyph-icon icon-linecons-fire"></i>
-                            <span>{% trans "Web Terminal" %}</span>
-                            <span class="bs-label badge-yellow">{% trans "NEW" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'terminal' %}"
-                                       title="{% trans 'Web Based Terminal' %}"><span>{% trans "Terminal" %}</span></a>
-                                </li>
-                            </ul>
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="serverACL">
-                        <a href="#" title="{% trans 'CloudLinux' %}">
-                            <i class="glyph-icon icon-linecons-fire"></i>
-                            <span>{% trans "CloudLinux" %}</span>
-                            <span class="bs-label badge-yellow">{% trans "NEW" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'CreatePackageCL' %}"
-                                       title="{% trans 'Create Cloud Linux Package' %}"><span>{% trans "Create Package" %}</span></a>
-                                </li>
-                            </ul>
-                            <ul>
-                                <li><a href="{% url 'listPackagesCL' %}"
-                                       title="{% trans 'List Cloud Linux Package' %}"><span>{% trans "List Packages" %}</span></a>
-                                </li>
-                            </ul>
-                            <ul>
-                                <li><a href="{% url 'monitorUsage' %}"
-                                       title="{% trans 'Monitor Usage of your Websites' %}"><span>{% trans "Monitor Usage" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-
-                    <li class="serverACL">
-                        <a href="#" title="{% trans 'Containerization' %}">
-                            <i class="glyph-icon icon-linecons-fire"></i>
-                            <span>{% trans "Containerization" %}</span>
-                            <span class="bs-label badge-yellow">{% trans "NEW" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'cHome' %}"
-                                       title="{% trans 'Create Website Limits' %}"><span>{% trans "Create Limits" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="serverACL">
-                        <a href="#" title="{% trans 'Docker' %}">
-                            <i class="glyph-icon icon-cogs"></i>
-                            <span>{% trans "Docker Manager" %}</span>
-                            <span class="bs-label badge-yellow">{% trans "NEW" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'manageImages' %}"
-                                       title="{% trans 'Manage Docker Images' %}"><span>{% trans "Manage Images" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'listContainers' %}"
-                                       title="{% trans 'Manage Docker Containers' %}"><span>{% trans "Manage Containers" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'containerImage' %}"
-                                       title="{% trans 'Create New Docker Container' %}"><span>{% trans "Create New Container" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="serverACL">
-                        <a href="#" title="{% trans 'Tuning' %}">
-                            <i class="glyph-icon icon-adjust"></i>
-                            <span>{% trans "Tuning" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'liteSpeedTuning' %}"
-                                       title="{% trans 'LiteSpeed Tuning' %}"><span>{% trans "LiteSpeed Tuning" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'phpTuning' %}"
-                                       title="{% trans 'PHP Tuning' %}"><span>{% trans "PHP Tuning" %}</span></a></li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="serverACL">
-                        <a href="#" title="{% trans 'Server Status' %}">
-                            <i class="glyph-icon icon-cog"></i>
-                            <span>{% trans "Server Status" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'topProcesses' %}"
-                                       title="{% trans 'Top Processes' %}"><span>{% trans "Top Processes" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'litespeedStatus' %}"
-                                       title="{% trans 'LiteSpeed Status' %}"><span>{% trans "LiteSpeed Status" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'cyberCPMainLogFile' %}"
-                                       title="{% trans 'CyberPanel Main Log File' %}"><span>{% trans "CyberPanel Main Log File" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'services' %}"
-                                       title="{% trans 'Services Status' %}"><span>{% trans "Services Status" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'CyberPanelPort' %}"
-                                       title="{% trans 'Change CyberPanel Port' %}"><span>{% trans "Change Port" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'packageManager' %}"
-                                       title="{% trans 'Package Manager' %}"><span>{% trans "Package Manager" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="serverACL">
-                        <a href="{% url 'loadPHPHome' %}" title="{% trans 'PHP' %}">
-                            <i class="glyph-icon icon-code"></i>
-                            <span>{% trans "PHP" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'installExtensions' %}"
-                                       title="{% trans 'Install PHP Extensions' %}"><span>{% trans "Install Extensions" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'editPHPConfigs' %}"
-                                       title="{% trans 'Edit PHP Configs' %}"><span>{% trans "Edit PHP Configs" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="serverACL">
-                        <a href="{% url 'logsHome' %}" title="{% trans 'Server Status' %}">
-                            <i class="glyph-icon icon-file"></i>
-                            <span>{% trans "Logs" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'serverMail' %}"
-                                       title="{% trans 'Server Mail' %}"><span>{% trans "Server Mail" %}</span></a></li>
-                                <li><a href="{% url 'accessLogs' %}"
-                                       title="{% trans 'Access Log' %}"><span>{% trans "Access Log" %}</span></a></li>
-                                <li><a href="{% url 'errorLogs' %}"
-                                       title="{% trans 'Error Logs' %}"><span>{% trans "Error Logs" %}</span></a></li>
-                                <li><a href="{% url 'emaillogs' %}"
-                                       title="{% trans 'Email Logs' %}"><span>{% trans "Email Log" %}</span></a></li>
-                                <li><a href="{% url 'ftplogs' %}"
-                                       title="{% trans 'FTP Logs' %}"><span>{% trans "FTP Logs" %}</span></a></li>
-                                <li><a href="{% url 'modSecAuditLogs' %}"
-                                       title="{% trans 'ModSecurity Audit Logs' %}"><span>{% trans "ModSec Audit Logs" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="serverACL">
-                        <a href="{% url 'securityHome' %}" title="{% trans 'Security' %}">
-                            <i class="glyph-icon icon-shield"></i>
-                            <span>{% trans "Security" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'firewallHome' %}"
-                                       title="{% trans 'Firewall Home' %}"><span>{% trans "Firewall" %}</span></a></li>
-                                <li><a href="{% url 'secureSSH' %}"
-                                       title="{% trans 'Secure SSH' %}"><span>{% trans "Secure SSH" %}</span></a></li>
-                                <li><a href="{% url 'modSecurity' %}"
-                                       title="{% trans 'ModSecurity Configurations' %}"><span>{% trans "ModSecurity Conf" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'modSecRules' %}"
-                                       title="{% trans 'ModSecurity Rules' %}"><span>{% trans "ModSecurity Rules" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'modSecRulesPacks' %}"
-                                       title="{% trans 'ModSecurity Rules Packs' %}"><span>{% trans "ModSecurity Rules Packs" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'csf' %}"
-                                       title="{% trans 'ConfigServer Security & Firewall (CSF)' %}"><span>{% trans "CSF" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'CageFS' %}"
-                                       title="{% trans 'CageFS Configurations' %}"><span>{% trans "CageFS" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'imunify' %}"
-                                       title="{% trans 'Imunify 360' %}"><span>{% trans "Imunify 360" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'imunifyAV' %}"
-                                       title="{% trans 'ImunifyAV' %}"><span>{% trans "ImunifyAV" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="serverACL emailAsWhole">
-                        <a href="#" title="{% trans 'Mail Settings' %}">
-                            <i class="glyph-icon icon-envelope"></i>
-                            <span>{% trans "Mail Settings" %}</span>
-                            <span class="bs-label badge-yellow">{% trans "NEW" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'mailQueue' %}"
-                                       title="{% trans 'Mail Queue' %}"><span>{% trans "Mail Queue" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'emailPolicyServer' %}"
-                                       title="{% trans 'Email Policy Server' %}"><span>{% trans "Email Policy Server" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'listDomains' %}"
-                                       title="{% trans 'Email Limits' %}"><span>{% trans "Email Limits" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'SpamAssassin' %}"
-                                       title="{% trans 'SpamAssassin Configurations' %}"><span>{% trans "SpamAssassin" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'emailMarketing' %}"
-                                       title="{% trans 'Email Marketing' %}"><span>{% trans "Email Marketing" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'MailScanner' %}"
-                                       title="{% trans 'MailScanner' %}"><span>{% trans "MailScanner" %}</span></a>
-                                </li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="serverACL">
-                        <a href="#" title="{% trans 'Manage Services' %}">
-                            <i class="glyph-icon icon-folder-open"></i>
-                            <span>{% trans "Manage Services" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'manageApplications' %}"
-                                       title="{% trans 'Manage Applications' %}"><span>{% trans "Applications" %}</span></a></li>
-                                <li><a href="{% url 'managePowerDNS' %}"
-                                       title="{% trans 'Manage PowerDNS' %}"><span>{% trans "Manage PowerDNS" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'managePostfix' %}"
-                                       title="{% trans 'Manage Postfix' %}"><span>{% trans "Manage Postfix" %}</span></a>
-                                </li>
-                                <li><a href="{% url 'managePureFtpd' %}"
-                                       title="{% trans 'Manage FTP' %}"><span>{% trans "Manage FTP" %}</span></a></li>
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                    <li class="serverACL">
-                        <a href="#" title="{% trans 'Plugins' %}">
-                            <i class="glyph-icon icon-plug"></i>
-                            <span>{% trans "Plugins" %}</span>
-                        </a>
-                        <div class="sidebar-submenu">
-
-                            <ul>
-                                <li><a href="{% url 'installed' %}"
-                                       title="{% trans 'Installed Plugins' %}"><span>{% trans "Installed" %}</span></a>
-                                </li>
-                                {# pluginsList #}
-                            </ul>
-
-                        </div><!-- .sidebar-submenu -->
-                    </li>
-
-                </ul><!-- #sidebar-menu -->
-
             </div>
-        </div>
 
-        <div id="page-content-wrapper">
-            <div id="page-content">
+            <div id="page-content-wrapper">
+                <div id="page-content">
 
 
-                {% block content %}
-                {% endblock %}
+                    {% block content %}
+                    {% endblock %}
+
+                </div>
 
             </div>
 
         </div>
 
-    </div>
 
+        <!-- WIDGETS -->
 
-    <!-- WIDGETS -->
+        <!-- Sparklines charts -->
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/qrious/4.0.2/qrious.js"></script>
+        <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
+        <script src="{% static 'baseTemplate/custom-js/pnotify.custom.min.js' %}"></script>
+        <script src="{% static 'baseTemplate/custom-js/system-status.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'packages/packages.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'websiteFunctions/websiteFunctions.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'tuning/tuning.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'serverStatus/serverStatus.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'dns/dns.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'ftp/ftp.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'userManagment/userManagment.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'databases/databases.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'mailServer/mailServer.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'serverLogs/serverLogs.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'emailPremium/emailPremium.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'emailMarketing/emailMarketing.js' %}?ver={{ version }}"></script>
 
-    <!-- Sparklines charts -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/qrious/4.0.2/qrious.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
-    <script src="{% static 'baseTemplate/custom-js/pnotify.custom.min.js' %}"></script>
-    <script src="{% static 'baseTemplate/custom-js/system-status.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'packages/packages.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'websiteFunctions/websiteFunctions.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'tuning/tuning.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'serverStatus/serverStatus.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'dns/dns.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'ftp/ftp.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'userManagment/userManagment.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'databases/databases.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'mailServer/mailServer.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'serverLogs/serverLogs.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'emailPremium/emailPremium.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'emailMarketing/emailMarketing.js' %}?ver={{ version }}"></script>
-
-    <script type="text/javascript" src="{% static 'baseTemplate/assets/finalJS/final.js' %}"></script>
-    <script src="{% static 'backup/backup.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'managePHP/managePHP.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'baseTemplate/bootstrap-toggle.min.js' %}"></script>
-    <script src="{% static 'firewall/firewall.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'manageSSL/manageSSL.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'manageServices/manageServices.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'dockerManager/dockerManager.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'containerization/containerization.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'CLManager/CLManager.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'IncBackups/IncBackups.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'WebTerminal/term.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'WebTerminal/ws.js' %}?ver={{ version }}"></script>
-    <script src="{% static 'WebTerminal/main.js' %}?ver={{ version }}"></script>
+        <script type="text/javascript" src="{% static 'baseTemplate/assets/finalJS/final.js' %}"></script>
+        <script src="{% static 'backup/backup.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'managePHP/managePHP.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'baseTemplate/bootstrap-toggle.min.js' %}"></script>
+        <script src="{% static 'firewall/firewall.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'manageSSL/manageSSL.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'manageServices/manageServices.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'dockerManager/dockerManager.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'containerization/containerization.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'CLManager/CLManager.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'IncBackups/IncBackups.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'WebTerminal/term.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'WebTerminal/ws.js' %}?ver={{ version }}"></script>
+        <script src="{% static 'WebTerminal/main.js' %}?ver={{ version }}"></script>
 
     {% endwith %}
 
-</div>
-{% block footer_scripts %}
-{% endblock %}
-</body>
+    </div>
+    {% block footer_scripts %}
+    {% endblock %}
+    </body>
 </html>
diff --git a/baseTemplate/views.py b/baseTemplate/views.py
index d1cb341be..5e28396ca 100755
--- a/baseTemplate/views.py
+++ b/baseTemplate/views.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-
-
 from django.shortcuts import render,redirect
 from django.http import HttpResponse
 from plogical.getSystemInformation import SystemInformation
@@ -16,6 +14,7 @@ from plogical.acl import ACLManager
 from manageServices.models import PDNSStatus
 from django.views.decorators.csrf import ensure_csrf_cookie
 from plogical.processUtilities import ProcessUtilities
+from plogical.httpProc import httpProc
 # Create your views here.
 
 VERSION = '2.0'
@@ -23,22 +22,12 @@ BUILD = 3
 
 @ensure_csrf_cookie
 def renderBase(request):
-    try:
-        userID = request.session['userID']
-        currentACL = ACLManager.loadedACL(userID)
-
-        if currentACL['admin'] == 1:
-            admin = 1
-        else:
-            admin = 0
-
-        cpuRamDisk = SystemInformation.cpuRamDisk()
-
-        finaData = {"admin": admin,'ramUsage':cpuRamDisk['ramUsage'],'cpuUsage':cpuRamDisk['cpuUsage'],'diskUsage':cpuRamDisk['diskUsage'] }
-
-        return render(request, 'baseTemplate/homePage.html', finaData)
-    except KeyError:
-        return redirect(loadLoginPage)
+    template = 'baseTemplate/homePage.html'
+    cpuRamDisk = SystemInformation.cpuRamDisk()
+    finaData = {'ramUsage': cpuRamDisk['ramUsage'], 'cpuUsage': cpuRamDisk['cpuUsage'],
+                'diskUsage': cpuRamDisk['diskUsage']}
+    proc = httpProc(request, template, finaData)
+    return proc.render()
 
 def getAdminStatus(request):
     try:
diff --git a/plogical/acl.py b/plogical/acl.py
index b87a85f72..bb2436806 100644
--- a/plogical/acl.py
+++ b/plogical/acl.py
@@ -76,73 +76,76 @@ class ACLManager:
         else:
             finalResponse['admin'] = 0
 
+            config = json.loads(admin.acl.config)
+
             acl = ACL.objects.get(name=admin.acl.name)
-            finalResponse['versionManagement'] = acl.versionManagement
+            finalResponse['versionManagement'] = config['versionManagement']
 
             ## User Management
 
-            finalResponse['createNewUser'] = acl.createNewUser
-            finalResponse['listUsers'] = acl.listUsers
-            finalResponse['deleteUser'] = acl.deleteUser
-            finalResponse['changeUserACL'] = acl.changeUserACL
-            finalResponse['resellerCenter'] = acl.resellerCenter
+            finalResponse['createNewUser'] = config['createNewUser']
+            finalResponse['listUsers'] = config['listUsers']
+            finalResponse['deleteUser'] = config['deleteUser']
+            finalResponse['changeUserACL'] = config['changeUserACL']
+            finalResponse['resellerCenter'] = config['resellerCenter']
 
             ## Website Management
 
-            finalResponse['createWebsite'] = acl.createWebsite
-            finalResponse['modifyWebsite'] = acl.modifyWebsite
-            finalResponse['suspendWebsite'] = acl.suspendWebsite
-            finalResponse['deleteWebsite'] = acl.deleteWebsite
+            finalResponse['createWebsite'] = config['createWebsite']
+            finalResponse['modifyWebsite'] = config['modifyWebsite']
+            finalResponse['suspendWebsite'] = config['suspendWebsite']
+            finalResponse['deleteWebsite'] = config['deleteWebsite']
 
             ## Package Management
 
 
-            finalResponse['createPackage'] = acl.createPackage
-            finalResponse['listPackages'] = acl.listPackages
-            finalResponse['deletePackage'] = acl.deletePackage
-            finalResponse['modifyPackage'] = acl.modifyPackage
+            finalResponse['createPackage'] = config['createPackage']
+            finalResponse['listPackages'] = config['listPackages']
+            finalResponse['deletePackage'] = config['deletePackage']
+            finalResponse['modifyPackage'] = config['modifyPackage']
 
             ## Database Management
 
-            finalResponse['createDatabase'] = acl.createDatabase
-            finalResponse['deleteDatabase'] = acl.deleteDatabase
-            finalResponse['listDatabases'] = acl.listDatabases
+            finalResponse['createDatabase'] = config['createDatabase']
+            finalResponse['deleteDatabase'] = config['deleteDatabase']
+            finalResponse['listDatabases'] = config['listDatabases']
 
             ## DNS Management
 
-            finalResponse['createNameServer'] = acl.createNameServer
-            finalResponse['createDNSZone'] = acl.createDNSZone
-            finalResponse['deleteZone'] = acl.deleteZone
-            finalResponse['addDeleteRecords'] = acl.addDeleteRecords
+            finalResponse['createNameServer'] = config['createNameServer']
+            finalResponse['createDNSZone'] = config['createDNSZone']
+            finalResponse['deleteZone'] = config['deleteZone']
+            finalResponse['addDeleteRecords'] = config['addDeleteRecords']
 
             ## Email Management
 
-            finalResponse['createEmail'] = acl.createEmail
-            finalResponse['listEmails'] = acl.listEmails
-            finalResponse['deleteEmail'] = acl.deleteEmail
-            finalResponse['emailForwarding'] = acl.emailForwarding
-            finalResponse['changeEmailPassword'] = acl.changeEmailPassword
-            finalResponse['dkimManager'] = acl.dkimManager
+            finalResponse['createEmail'] = config['createEmail']
+            finalResponse['listEmails'] = config['listEmails']
+            finalResponse['deleteEmail'] = config['deleteEmail']
+            finalResponse['emailForwarding'] = config['emailForwarding']
+            finalResponse['changeEmailPassword'] = config['changeEmailPassword']
+            finalResponse['dkimManager'] = config['dkimManager']
 
             ## FTP Management
 
-            finalResponse['createFTPAccount'] = acl.createFTPAccount
-            finalResponse['deleteFTPAccount'] = acl.deleteFTPAccount
-            finalResponse['listFTPAccounts'] = acl.listFTPAccounts
+            finalResponse['createFTPAccount'] = config['createFTPAccount']
+            finalResponse['deleteFTPAccount'] = config['deleteFTPAccount']
+            finalResponse['listFTPAccounts'] = config['listFTPAccounts']
 
             ## Backup Management
 
-            finalResponse['createBackup'] = acl.createBackup
-            finalResponse['restoreBackup'] = acl.restoreBackup
-            finalResponse['addDeleteDestinations'] = acl.addDeleteDestinations
-            finalResponse['scheDuleBackups'] = acl.scheDuleBackups
-            finalResponse['remoteBackups'] = acl.remoteBackups
+            finalResponse['createBackup'] = config['createBackup']
+            finalResponse['googleDriveBackups'] = config['googleDriveBackups']
+            finalResponse['restoreBackup'] = config['restoreBackup']
+            finalResponse['addDeleteDestinations'] = config['addDeleteDestinations']
+            finalResponse['scheDuleBackups'] = config['scheDuleBackups']
+            finalResponse['remoteBackups'] = config['remoteBackups']
 
             ## SSL Management
 
-            finalResponse['manageSSL'] = acl.manageSSL
-            finalResponse['hostnameSSL'] = acl.hostnameSSL
-            finalResponse['mailServerSSL'] = acl.mailServerSSL
+            finalResponse['manageSSL'] = config['manageSSL']
+            finalResponse['hostnameSSL'] = config['hostnameSSL']
+            finalResponse['mailServerSSL'] = config['mailServerSSL']
 
         return finalResponse
 
diff --git a/plogical/httpProc.py b/plogical/httpProc.py
index aab53aba5..c4b980a81 100755
--- a/plogical/httpProc.py
+++ b/plogical/httpProc.py
@@ -12,18 +12,17 @@ class httpProc:
 
     def render(self):
         try:
-
+            from loginSystem.models import Administrator
+            from plogical.acl import ACLManager
             userID = self.request.session['userID']
-            admin = self.data['admin']
+            admin = Administrator.objects.get(pk=userID)
 
             ###
 
             if self.data == None:
                 self.data = {}
 
-            self.data['fullName'] = admin.fullName
-            self.data['ownerEmail'] = admin.email
-
+            self.data.update(ACLManager.loadedACL(userID))
             return render(self.request, self.templateName, self.data)
 
         except BaseException as msg:
diff --git a/userManagment/static/userManagment/userManagment.js b/userManagment/static/userManagment/userManagment.js
index 2dfc503b2..221d0e34b 100755
--- a/userManagment/static/userManagment/userManagment.js
+++ b/userManagment/static/userManagment/userManagment.js
@@ -458,6 +458,7 @@ app.controller('deleteUser', function ($scope, $http) {
 
 
 /* Java script code to create acl */
+
 app.controller('createACLCTRL', function ($scope, $http) {
 
     $scope.aclLoading = true;
@@ -520,11 +521,13 @@ app.controller('createACLCTRL', function ($scope, $http) {
     // Backup Management
 
     $scope.createBackup = true;
+    $scope.googleDriveBackups = true;
     $scope.restoreBackup = false;
     $scope.addDeleteDestinations = false;
     $scope.scheDuleBackups = false;
     $scope.remoteBackups = false;
 
+
     // SSL Management
 
     $scope.manageSSL = true;
@@ -599,6 +602,7 @@ app.controller('createACLCTRL', function ($scope, $http) {
             // Backup Management
 
             createBackup: $scope.createBackup,
+            googleDriveBackups: $scope.googleDriveBackups,
             restoreBackup: $scope.restoreBackup,
             addDeleteDestinations: $scope.addDeleteDestinations,
             scheDuleBackups: $scope.scheDuleBackups,
@@ -976,6 +980,7 @@ app.controller('modifyACLCtrl', function ($scope, $http) {
                 // Backup Management
 
                 $scope.createBackup = Boolean(response.data.createBackup);
+                $scope.googleDriveBackups = Boolean(response.data.googleDriveBackups);
                 $scope.restoreBackup = Boolean(response.data.restoreBackup);
                 $scope.addDeleteDestinations = Boolean(response.data.addDeleteDestinations);
                 $scope.scheDuleBackups = Boolean(response.data.scheDuleBackups);
@@ -1076,6 +1081,7 @@ app.controller('modifyACLCtrl', function ($scope, $http) {
             // Backup Management
 
             createBackup: $scope.createBackup,
+            googleDriveBackups: $scope.googleDriveBackups,
             restoreBackup: $scope.restoreBackup,
             addDeleteDestinations: $scope.addDeleteDestinations,
             scheDuleBackups: $scope.scheDuleBackups,
diff --git a/userManagment/templates/userManagment/createACL.html b/userManagment/templates/userManagment/createACL.html
index 298adf867..111cc9deb 100755
--- a/userManagment/templates/userManagment/createACL.html
+++ b/userManagment/templates/userManagment/createACL.html
@@ -353,6 +353,17 @@
                                     </label>
                                 </div>
                             </div>
+
+                            <label class="col-sm-3 control-label"></label>
+                            <div class="col-sm-9">
+                                <div class="checkbox">
+                                    <label>
+                                        <input ng-model="googleDriveBackups" type="checkbox" value="">
+                                        {% trans "Google Drive Backups" %}
+                                    </label>
+                                </div>
+                            </div>
+
                             <label class="col-sm-3 control-label"></label>
                             <div class="col-sm-9">
                                 <div class="checkbox">
diff --git a/userManagment/templates/userManagment/modifyACL.html b/userManagment/templates/userManagment/modifyACL.html
index e2043cedc..9c1f3156d 100755
--- a/userManagment/templates/userManagment/modifyACL.html
+++ b/userManagment/templates/userManagment/modifyACL.html
@@ -357,6 +357,17 @@
                                     </label>
                                 </div>
                             </div>
+
+                            <label class="col-sm-3 control-label">{% trans "" %}</label>
+                            <div class="col-sm-9">
+                                <div class="checkbox">
+                                    <label>
+                                        <input ng-model="googleDriveBackups" type="checkbox" value="">
+                                        {% trans "Google Drive Backups" %}
+                                    </label>
+                                </div>
+                            </div>
+
                             <label class="col-sm-3 control-label"></label>
                             <div class="col-sm-9">
                                 <div class="checkbox">
diff --git a/userManagment/views.py b/userManagment/views.py
index 0a9100e2f..01256fd46 100755
--- a/userManagment/views.py
+++ b/userManagment/views.py
@@ -514,74 +514,12 @@ def createACLFunc(request):
 
             ## Version Management
 
-            newACL = ACL(name=data['aclName'],
-                         adminStatus=int(data['makeAdmin']),
+            if data['makeAdmin']:
+                data['adminStatus'] = 1
+            else:
+                data['adminStatus'] = 0
 
-                         versionManagement=int(data['versionManagement']),
-
-                         ## User Management
-                         createNewUser=int(data['createNewUser']),
-                         listUsers=int(data['listUsers']),
-                         resellerCenter=int(data['resellerCenter']),
-                         deleteUser=int(data['deleteUser']),
-                         changeUserACL=int(data['changeUserACL']),
-
-                         ## Website Management
-
-                         createWebsite=int(data['createWebsite']),
-                         modifyWebsite=int(data['modifyWebsite']),
-                         suspendWebsite=int(data['suspendWebsite']),
-                         deleteWebsite=int(data['deleteWebsite']),
-
-                         ## Package Management
-
-                         createPackage=int(data['createPackage']),
-                         listPackages=int(data['listPackages']),
-                         deletePackage=int(data['deletePackage']),
-                         modifyPackage=int(data['modifyPackage']),
-
-                         ## Database Management
-
-                         createDatabase=int(data['createDatabase']),
-                         deleteDatabase=int(data['deleteDatabase']),
-                         listDatabases=int(data['listDatabases']),
-
-                         ## DNS Management
-
-                         createNameServer=int(data['createNameServer']),
-                         createDNSZone=int(data['createDNSZone']),
-                         deleteZone=int(data['deleteZone']),
-                         addDeleteRecords=int(data['addDeleteRecords']),
-
-                         ## Email Management
-
-                         createEmail=int(data['createEmail']),
-                         listEmails=int(data['listEmails']),
-                         deleteEmail=int(data['deleteEmail']),
-                         emailForwarding=int(data['emailForwarding']),
-                         changeEmailPassword=int(data['changeEmailPassword']),
-                         dkimManager=int(data['dkimManager']),
-
-                         ## FTP Management
-
-                         createFTPAccount=int(data['createFTPAccount']),
-                         deleteFTPAccount=int(data['deleteFTPAccount']),
-                         listFTPAccounts=int(data['listFTPAccounts']),
-
-                         ## Backup Management
-
-                         createBackup=int(data['createBackup']),
-                         restoreBackup=int(data['restoreBackup']),
-                         addDeleteDestinations=int(data['addDeleteDestinations']),
-                         scheDuleBackups=int(data['scheDuleBackups']),
-                         remoteBackups=int(data['remoteBackups']),
-
-                         ## SSL Management
-
-                         manageSSL=int(data['manageSSL']),
-                         hostnameSSL=int(data['hostnameSSL']),
-                         mailServerSSL=int(data['mailServerSSL']),
-                         )
+            newACL = ACL(name=data['aclName'],config=json.dumps(data))
             newACL.save()
 
             finalResponse = {'status': 1}
@@ -658,75 +596,8 @@ def fetchACLDetails(request):
 
             ## Version Management
             finalResponse = {}
-
             acl = ACL.objects.get(name=data['aclToModify'])
-            finalResponse['versionManagement'] = acl.versionManagement
-            finalResponse['adminStatus'] = acl.adminStatus
-
-            ## User Management
-
-            finalResponse['createNewUser'] = acl.createNewUser
-            finalResponse['listUsers'] = acl.listUsers
-            finalResponse['resellerCenter'] = acl.resellerCenter
-            finalResponse['deleteUser'] = acl.deleteUser
-            finalResponse['changeUserACL'] = acl.changeUserACL
-
-            ## Website Management
-
-            finalResponse['createWebsite'] = acl.createWebsite
-            finalResponse['modifyWebsite'] = acl.modifyWebsite
-            finalResponse['suspendWebsite'] = acl.suspendWebsite
-            finalResponse['deleteWebsite'] = acl.deleteWebsite
-
-            ## Package Management
-
-            finalResponse['createPackage'] = acl.createPackage
-            finalResponse['listPackages'] = acl.listPackages
-            finalResponse['deletePackage'] = acl.deletePackage
-            finalResponse['modifyPackage'] = acl.modifyPackage
-
-            ## Database Management
-
-            finalResponse['createDatabase'] = acl.createDatabase
-            finalResponse['deleteDatabase'] = acl.deleteDatabase
-            finalResponse['listDatabases'] = acl.listDatabases
-
-            ## DNS Management
-
-            finalResponse['createNameServer'] = acl.createNameServer
-            finalResponse['createDNSZone'] = acl.createDNSZone
-            finalResponse['deleteZone'] = acl.deleteZone
-            finalResponse['addDeleteRecords'] = acl.addDeleteRecords
-
-            ## Email Management
-
-            finalResponse['createEmail'] = acl.createEmail
-            finalResponse['listEmails'] = acl.listEmails
-            finalResponse['deleteEmail'] = acl.deleteEmail
-            finalResponse['emailForwarding'] = acl.emailForwarding
-            finalResponse['changeEmailPassword'] = acl.changeEmailPassword
-            finalResponse['dkimManager'] = acl.dkimManager
-
-            ## FTP Management
-
-            finalResponse['createFTPAccount'] = acl.createFTPAccount
-            finalResponse['deleteFTPAccount'] = acl.deleteFTPAccount
-            finalResponse['listFTPAccounts'] = acl.listFTPAccounts
-
-            ## Backup Management
-
-            finalResponse['createBackup'] = acl.createBackup
-            finalResponse['restoreBackup'] = acl.restoreBackup
-            finalResponse['addDeleteDestinations'] = acl.addDeleteDestinations
-            finalResponse['scheDuleBackups'] = acl.scheDuleBackups
-            finalResponse['remoteBackups'] = acl.remoteBackups
-
-            ## SSL Management
-
-            finalResponse['manageSSL'] = acl.manageSSL
-            finalResponse['hostnameSSL'] = acl.hostnameSSL
-            finalResponse['mailServerSSL'] = acl.mailServerSSL
-
+            finalResponse = json.loads(acl.config)
             finalResponse['status'] = 1
         else:
             return ACLManager.loadErrorJson()
@@ -750,73 +621,7 @@ def submitACLModifications(request):
             ## Version Management
 
             acl = ACL.objects.get(name=data['aclToModify'])
-            acl.adminStatus = int(data['adminStatus'])
-            acl.versionManagement = int(data['versionManagement'])
-
-            ## User Management
-
-            acl.createNewUser = int(data['createNewUser'])
-            acl.listUsers = int(data['listUsers'])
-            acl.resellerCenter = int(data['resellerCenter'])
-            acl.deleteUser = int(data['deleteUser'])
-            acl.changeUserACL = int(data['changeUserACL'])
-
-            ## Website Management
-
-            acl.createWebsite = int(data['createWebsite'])
-            acl.modifyWebsite = int(data['modifyWebsite'])
-            acl.suspendWebsite = int(data['suspendWebsite'])
-            acl.deleteWebsite = int(data['deleteWebsite'])
-
-            ## Package Management
-
-            acl.createPackage = int(data['createPackage'])
-            acl.listPackages = int(data['listPackages'])
-            acl.deletePackage = int(data['deletePackage'])
-            acl.modifyPackage = int(data['modifyPackage'])
-
-            ## Database Management
-
-            acl.createDatabase = int(data['createDatabase'])
-            acl.deleteDatabase = int(data['deleteDatabase'])
-            acl.listDatabases = int(data['listDatabases'])
-
-            ## DNS Management
-
-            acl.createNameServer = int(data['createNameServer'])
-            acl.createDNSZone = int(data['createDNSZone'])
-            acl.deleteZone = int(data['deleteZone'])
-            acl.addDeleteRecords = int(data['addDeleteRecords'])
-
-            ## Email Management
-
-            acl.createEmail = int(data['createEmail'])
-            acl.listEmails = int(data['listEmails'])
-            acl.deleteEmail = int(data['deleteEmail'])
-            acl.emailForwarding = int(data['emailForwarding'])
-            acl.changeEmailPassword = int(data['changeEmailPassword'])
-            acl.dkimManager = int(data['dkimManager'])
-
-            ## FTP Management
-
-            acl.createFTPAccount = int(data['createFTPAccount'])
-            acl.deleteFTPAccount = int(data['deleteFTPAccount'])
-            acl.listFTPAccounts = int(data['listFTPAccounts'])
-
-            ## Backup Management
-
-            acl.createBackup = int(data['createBackup'])
-            acl.restoreBackup = int(data['restoreBackup'])
-            acl.addDeleteDestinations = int(data['addDeleteDestinations'])
-            acl.scheDuleBackups = int(data['scheDuleBackups'])
-            acl.remoteBackups = int(data['remoteBackups'])
-
-            ## SSL Management
-
-            acl.manageSSL = int(data['manageSSL'])
-            acl.hostnameSSL = int(data['hostnameSSL'])
-            acl.mailServerSSL = int(data['mailServerSSL'])
-
+            acl.config=json.dumps(data)
             acl.save()
 
             if int(data['adminStatus']) == 1: