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 1127a37a5..3d7b4f2b5 100755
--- a/baseTemplate/views.py
+++ b/baseTemplate/views.py
@@ -314,7 +314,6 @@ def FileManager(request):
 
     template = 'baseTemplate/FileManager.html'
 
-
     proc = httpProc(request, template,)
     return proc.render()