diff --git a/amadeus/static/css/base/amadeus_responsive.css b/amadeus/static/css/base/amadeus_responsive.css
index c44e713..715bb7f 100644
--- a/amadeus/static/css/base/amadeus_responsive.css
+++ b/amadeus/static/css/base/amadeus_responsive.css
@@ -305,6 +305,11 @@
     	width: 50px;
 	}
 
+	.navbar-collapse{
+		background: #EDEDEE;
+		color: #000000;
+	}
+
 }
 @media(max-width:610px){
 	.outside-title{
diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index 978dec8..c5e1199 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -249,37 +249,11 @@
             <div class="navbar-collapse collapse navbar-responsive-collapse">
 
                 <ul class="nav navbar-nav navbar-right notifications">
-                    <li class="dropdown language-selector-on-header" title data-original-title="{% trans 'Language Selector' %}" style="width:40px;">
-                        <a href="#" class="dropdown-toggle title" data-toggle="dropdown" data-close-others="true">
-                            <i class="fa fa-cog hidden-xs" aria-hidden="true"></i>
-                            <span class="visible-xs-inline">{% trans 'Language Selector' %}</span>
-                            {% with 'img/'|add:LANGUAGE_CODE|add:'.png' as image_static %}
-                                <img src="{% static image_static %}" />
-                            {% endwith %}
-                        </a>
-                        <a href="#" class="dropdown-toggle no-title" data-toggle="dropdown" style="padding-left:0px;padding-right:0px;font-size:14px;text-align:center" data-close-others="true">
-                            <span>[{{LANGUAGE_CODE}}]</span>
-                        </a>
-                        <ul class="dropdown-menu">
-                            {% get_available_languages as LANGUAGES %}
-                            {% get_language_info_list for LANGUAGES as languages %}
-                            {% for language in languages %}
-                                <li {% if language.code == LANGUAGE_CODE %}class="active"{% endif %}>
-                                    <a class="language-item" value-lang="{{language.code}}">
-                                        <span>{{language.code}}</span>
-                                    </a>
-                                </li>
-                            {% endfor %}
-                        </ul>
-                    </li>
-                    <li style="width:40px;">
-                        <a href="{% url 'themes:contrast' %}" id="contrast_button">
-                            <i style="font-size:15px;right: 150%;" class="glyphicon glyphicon-adjust"></i>
-                        </a>
+                    <li>
+                        <img src="{{ user.image_url }}" style="width:50px;height:50px; margin:10px;"/>
                     </li>
                     <li id="profile-menu" class="dropdown" data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}">
-                        <a href="" data-toggle="dropdown" class="dropdown-toggle profile">
-                            <img src="{{ user.image_url }}" class="hidden-xs" style="width:50px;height:50px" />
+                        <a href="" data-toggle="dropdown" class="dropdown-toggle profile" style="content:none;">
                             <span class="visible-xs-inline">{{ user }}</span>
                         </a>
                         <ul class="dropdown-menu" role="menu">
@@ -287,46 +261,35 @@
                             <li><a href="{% url 'users:edit_profile' %}">{% trans 'Edit Profile' %}</a></li>
                             <li><a href="{% url 'users:change_pass' %}">{% trans 'Change Password' %}</a></li>
                             <li><a href="javascript:delete_subject.get('{% url 'users:remove_acc' %}','#remove_account','#remove_acc')">{% trans 'Delete Account' %}</a></li>
-                            <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
                         </ul>
                     </li>
 
                     {% if user.is_staff %}
-                        <li id="staff-menu" style="width:40px;" class="dropdown {{ settings_menu_active }}" title data-original-title="{% trans 'settings' %}">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                                <i class="fa fa-cog hidden-xs" style="position:relative;right:150%;"aria-hidden="true"></i>
-                                <span class="visible-xs-inline">{% trans 'Settings' %}</span>
-                            </a>
-                            <ul class="dropdown-menu" role="menu">
-                                <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
-                                <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
-                                <li><a href="{% url 'news:manage_news' %}">{% trans 'Manage News' %}</a></li>
-                                <li class="dropdown-accordion" data-accordion="#system_accordion">
-                                    <div class="panel-group" id="system_accordion">
-                                        <div class="panel panel-default">
-                                            <div class="panel-heading">
-                                                <a href="#system_menu" data-toggle="collapse" data-parent="#system_accordion">
-                                                    <h4 class="panel-title">
-                                                        {% trans 'System' %}
-                                                    </h4>
-                                                </a>
-                                            </div>
-                                            <div class="panel-collapse collapse" id="system_menu">
-                                                <div class="panel-body">
-                                                    <ul class="submenu">
-                                                        <li><a href="{% url 'mailsender:update' %}">{% trans 'Mail Sender' %}</a></li>
-                                                        <li><a href="{% url 'security:update' %}">{% trans 'Security' %}</a></li>
-                                                        <li><a href="{% url 'themes:manage' %}">{% trans 'Theme' %}</a></li>
-                                                        <li><a href="{% url 'webconferences:settings' %}">{% trans 'Web Conference' %}</a></li>
-                                                    </ul>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </li>
-                            </ul>
-                        </li>
+                        <li><a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
+                        <li><a href="{% url 'categories:index' %}">{% trans 'Manage Categories' %}</a></li>
+                        <li><a href="{% url 'news:manage_news' %}">{% trans 'Manage News' %}</a></li>
+                                
+                        <li><a href="{% url 'themes:manage' %}">{% trans 'Theme' %}</a></li>
                     {% endif %}
+                    <li><a href="{% url 'users:logout' %}">{% trans 'Logout' %}</a></li>
+
+                    <li style="width:40px;">
+                        <a href="{% url 'themes:contrast' %}" id="contrast_button">
+                            <i style="font-size:15px;right: 150%;" class="glyphicon glyphicon-adjust"></i>
+                        </a>
+                    </li>
+                    <li>
+                        {% get_available_languages as LANGUAGES %}
+                        {% get_language_info_list for LANGUAGES as languages %}
+                        {% for language in languages %}
+                            <li {% if language.code == LANGUAGE_CODE %}class="active"{% endif %}>
+                                <a class="language-item" value-lang="{{language.code}}">
+                                    <span>{{language.code}}</span>
+                                </a>
+                            </li>
+                        {% endfor %}
+                    </li>
+                    
                 </ul>
             </div>
         </div>
--
libgit2 0.21.2