diff --git a/app/views/admin/sites/site_info.html.erb b/app/views/admin/sites/site_info.html.erb
index 49b15f64..64916d4d 100644
--- a/app/views/admin/sites/site_info.html.erb
+++ b/app/views/admin/sites/site_info.html.erb
@@ -5,15 +5,19 @@
 			<ul class="nav nav-tabs">
 				<% @site_valid_locales.each do |locale|%>
 				<%#= raise @site_valid_locales.inspect %>
-					<%= content_tag :li, link_to(I18nVariable.from_locale(locale), "##{locale}", :data => {:toggle => "tab"}), :class => (active_when_current_locale_eq locale)  %>
+					<%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => (active_when_current_locale_eq locale)  %>
 				<% end %>
 			</ul>
 			<div class="tab-content form-horizontal">
-				<%= f.check_box :title_always_on %> <%= t 'admin.always_display_title' %>
+				<div class="control-group">
+					<label class="control-label"><%= t 'admin.site_title' %></label>
+					<div class="controls">
+						<%= f.check_box :title_always_on %> <%= t 'admin.always_display_title' %>
+					</div>
+				</div>
 				<% @site_valid_locales.each do |locale|%>
-					<%= content_tag :div, :class	=> "tab-pane fade #{active_when_current_locale_eq locale}", :id => "#{locale}" do %>
+					<%= content_tag :div, :class	=> "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
 						<div class="control-group">
-							<label class="control-label"><%= t 'admin.site_title' %></label>
 							<div class="controls">
 								<%= f.fields_for :title, @site.title do |f| %>
 									<%= f.text_field locale, :class => "input-xxlarge" %>
@@ -21,6 +25,10 @@
 								<p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p>
 							</div>
 						</div>
+					<% end %>
+				<% end %>
+				<% @site_valid_locales.each do |locale|%>
+					<%= content_tag :div, :class	=> "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
 						<div class="control-group">
 							<label class="control-label"><%= t 'admin.keywords' %></label>
 							<div class="controls">