diff --git a/baseTemplate/templates/baseTemplate/FileManager.html b/baseTemplate/templates/baseTemplate/FileManager.html
index 5824d9bdf..12f387f07 100644
--- a/baseTemplate/templates/baseTemplate/FileManager.html
+++ b/baseTemplate/templates/baseTemplate/FileManager.html
@@ -41,7 +41,7 @@
 
 <nav id="navBar" class="navbar navbar-expand-lg navbar-light bg-light">
     <div class="header-logo">
-        <a href="/websites/{{ domainName }}"><img src="{% static 'filemanager/images/fileManager.png' %}"> <span style="display: none" id="domainNameInitial">{{ domainName }}</span></a>
+        <a href="{% url 'index' %}"><img src="{% static 'filemanager/images/fileManager.png' %}"> <span style="display: none" id="domainNameInitial">{{ domainName }}</span></a>
     </div>
     <!--- second bar ---->
 
diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index 18d2ad160..57282e9af 100755
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -333,12 +333,6 @@
                                        data-original-title=".icon-comments-alt" aria-describedby="tooltip896208"></i>
                                     <span>{% trans "Community" %}</span>
                                 </a>
-                                <a href="{% url 'Filemanager' %}"
-                                   title="{% trans 'FileManager' %}">
-                                    <i class="glyph-icon tooltip-button icon-link" title="{% trans 'FileManager' %}"
-                                       data-original-title=".icon-cloud-upload" aria-describedby="tooltip896208"></i>
-                                    <span>{% trans "FileManager" %}</span>
-                                </a>
 
                             {% endif %}
                         </li>
@@ -741,6 +735,14 @@
                         {% if admin %}
 
                             <li class="header"><span>{% trans "Server" %}</span></li>
+                            <li>
+                                <a href="{% url 'Filemanager' %}"
+                                   title="{% trans 'FileManager' %}">
+                                    <i class="glyph-icon tooltip-button icon-link" title="{% trans 'FileManager' %}"
+                                       data-original-title=".icon-cloud-upload" aria-describedby="tooltip896208"></i>
+                                    <span>{% trans "FileManager" %}</span>
+                                </a>
+                            </li>
 
 
 
diff --git a/baseTemplate/views.py b/baseTemplate/views.py
index dd531c02c..b3dd303dc 100755
--- a/baseTemplate/views.py
+++ b/baseTemplate/views.py
@@ -300,6 +300,7 @@ def getthemedata(request):
 
 
 def FileManager(request):
+<<<<<<< HEAD
     ### Load Custom CSS
     try:
         from baseTemplate.models import CyberPanelCosmetic
@@ -330,8 +331,15 @@ def FileManager(request):
         template = 'baseTemplate/FileManager.html'
     else:
       return  redirect("https://cyberpanel.net/adons")
+=======
+    val = request.session['userID']
+    currentACL = ACLManager.loadedACL(val)
+>>>>>>> d4e55339a16ee8d0b686a3699ac95a485364e69b
 
-
+    if currentACL['admin'] == 1:
+        pass
+    else:
+        return ACLManager.loadErrorJson('FilemanagerAdmin', 0)
 
 
     proc = httpProc(request, template,)