diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1b87254bb..b959d85c9 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -146,17 +146,18 @@ class ApplicationController < ActionController::Base
     if LIST[:forbidden_item_names].include?(env['PATH_INFO'].split('/')[1].to_s)
       condition = VALID_LOCALES.include?(session[:locale])
     #check if the default locale is present or not
-    elsif @site.default_locale.present?
-      default_locale = @site.default_locale
-      condition = @site.in_use_locales.include?(default_locale)
-    elsif !@site.enable_language_detection
+    elsif session[:locale]
+      condition = @site.in_use_locales.include?(session[:locale])
+    elsif @site.enable_language_detection
       #check enable langauge detection
       browser_locale = request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).first rescue nil
       condition = @site.in_use_locales.include?(browser_locale)
-    elsif session[:locale]
-      condition = @site.in_use_locales.include?(session[:locale])
+    elsif @site.default_locale.present?
+      default_locale = @site.default_locale
+      condition = @site.in_use_locales.include?(default_locale)
     end
-    session[:locale] = condition ? (default_locale || browser_locale || session[:locale]) : I18n.default_locale.to_s
+
+    session[:locale] = condition ? (browser_locale || session[:locale] || default_locale) : I18n.default_locale.to_s
     I18n.locale = session[:locale].to_sym
     @site_in_use_locales = @site.in_use_locales
     @site_valid_locales = site_locales_default_head(@site.valid_locales)
diff --git a/app/views/admin/items/_site_bar.html.erb b/app/views/admin/items/_site_bar.html.erb
index 0a83994bd..1397a3d4a 100644
--- a/app/views/admin/items/_site_bar.html.erb
+++ b/app/views/admin/items/_site_bar.html.erb
@@ -1,14 +1,3 @@
-<!-- <nav id="sidebar">
-  <h2 class="position"><a href="#"><i class="icons-flow-tree"></i></a></h2>
-  <div id="sidebar-menu">
-    <div class="scroller">
-    </div>
-  </div>
-  <div class="sub-nav-block-list">
-  </div>
-  <div class="sub-nav-arrow"></div>
-</nav> -->
-
 <nav id="sidebar">
 	<h2 class="position"><a href="#"><i class="icons-cog"></i></a></h2>
 	<div id="sidebar-menu">
@@ -32,6 +21,6 @@
 <!-- 				<li title="System Info"><a href="/orbit_4.0.1/admin/system_info/index.shtml?sidebarNavList=8&amp;subNavBlockList=0"><span><i class="icons-info-2"></i></span></a></li>
  -->			</ul>
 		</div>
+		<div class="sub-nav-arrow"></div>
 	</div>
-	<div class="sub-nav-arrow"></div>
 </nav>
\ No newline at end of file
diff --git a/app/views/admin/sites/_side_bar.html.erb b/app/views/admin/sites/_side_bar.html.erb
index 5ddb07e5c..9ab39fa41 100644
--- a/app/views/admin/sites/_side_bar.html.erb
+++ b/app/views/admin/sites/_side_bar.html.erb
@@ -21,6 +21,6 @@
 <!-- 				<li title="System Info"><a href="/orbit_4.0.1/admin/system_info/index.shtml?sidebarNavList=8&amp;subNavBlockList=0"><span><i class="icons-info-2"></i></span></a></li>
  -->			</ul>
 		</div>
+		<div class="sub-nav-arrow"></div>
 	</div>
-	<div class="sub-nav-arrow"></div>
 </nav>
\ No newline at end of file
diff --git a/app/views/admin/sites/preference.html.erb b/app/views/admin/sites/preference.html.erb
index eec4f860e..cbcc290d1 100644
--- a/app/views/admin/sites/preference.html.erb
+++ b/app/views/admin/sites/preference.html.erb
@@ -121,14 +121,14 @@
                   <div class="control-group">
                     <label class="control-label muted"><%= I18n.t('site.backend_openness_on') %></label>
                     <div class="controls">
-                      <%= f.check_box :backend_openness_on , :class=>"toggle-check", :data=> {  disabled: true } %>
+                      <%= f.check_box :backend_openness_on , :class=>"toggle-check", :data=> { disabled: true } %>
                       <span class="help-block">All users can visit backend pages</span>
                     </div>
                   </div>
                   <div class="control-group">
                     <label class="control-label muted"><%= I18n.t('site.enable_personal_desktop')%></label>
                     <div class="controls">
-                      <%= f.check_box :desktop_closed , :class=>"toggle-check", :data=> {  disabled: true } %>
+                      <%= f.check_box :desktop_closed , :class=>"toggle-check", :data=> { disabled: true } %>
                     </div>
                   </div>
 
@@ -164,7 +164,7 @@
                     <label class="control-label muted">Default Language</label>
                     <div class="controls">
                     <% @site_in_use_locales.each do |locale| %>
-                      <%= radio_button_tag "site[default_locale]", locale, @locale == locale ,:class=>"toggle-check in_use_locales", :data => { :title => "#{I18nVariable.from_locale(locale)}", disabled: true }  %>
+                      <%= radio_button_tag "site[default_locale]", locale, @locale == locale , @site.in_use_locales.include?(locale),:class=>"toggle-check in_use_locales", :data => { :title => "#{I18nVariable.from_locale(locale)}", disabled: true }  %>
                      <% end %>
                     </div>
                   </div>
diff --git a/app/views/admin/users_new_interface/_side_bar.html.erb b/app/views/admin/users_new_interface/_side_bar.html.erb
index 14874137b..1f43a0268 100644
--- a/app/views/admin/users_new_interface/_side_bar.html.erb
+++ b/app/views/admin/users_new_interface/_side_bar.html.erb
@@ -20,6 +20,7 @@
         <% end -%>
       <% end -%>
     </div>
+    <div class="sub-nav-arrow"></div>
   </div>
   <div class="sub-nav-block-list">
     <div class="sub-nav-block" data-icons="&#xe00d;">
@@ -50,6 +51,5 @@
       <% end -%>
     </div>
   </div>
-  <div class="sub-nav-arrow"></div>
 </nav>
 
diff --git a/config/mongoid.yml b/config/mongoid.yml
index 1b3b0585d..49a7167ce 100644
--- a/config/mongoid.yml
+++ b/config/mongoid.yml
@@ -8,7 +8,7 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: test_site_new
+  database: test_site
 
 
 
@@ -24,4 +24,4 @@ production:
   # password: <%= ENV['MONGOID_PASSWORD'] %>
   # database: <%= ENV['MONGOID_DATABASE'] %>
   <<: *defaults
-  database: test_site_new
+  database: test_site