diff --git a/app/controllers/admin/sites_controller.rb b/app/controllers/admin/sites_controller.rb
index 651d8bb3d..f9ce30816 100644
--- a/app/controllers/admin/sites_controller.rb
+++ b/app/controllers/admin/sites_controller.rb
@@ -59,6 +59,10 @@ class Admin::SitesController < OrbitBackendController
     
   end
 
+  def preference
+    
+  end
+
 
   def ui_theme
     
diff --git a/app/models/site.rb b/app/models/site.rb
index 9758c187d..7967c5394 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -33,6 +33,7 @@ class Site
   field :footer, localize: true
   field :sub_menu, localize: true
   field :terms_of_user, localize: true
+  field :google_analytics
 
   field :mobile_on, :type => Boolean, :default => false
 
diff --git a/app/views/admin/sites/_side_bar.html.erb b/app/views/admin/sites/_side_bar.html.erb
index bc12e7245..a1364789c 100644
--- a/app/views/admin/sites/_side_bar.html.erb
+++ b/app/views/admin/sites/_side_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">
@@ -27,7 +16,8 @@
 
 				<li title="Search Engine"><%= link_to admin_site_search_engine_path(@site), :class => active_for_action('sites', 'search_engine') do %><span><i class="icons-search"></i></span><%end%></li>
 
-				<li title="Preference"><a href="/orbit_4.0.1/admin/preference/index.shtml?sidebarNavList=7&amp;subNavBlockList=0"><span><i class="icons-cog"></i></span></a></li>
+				<li title="Preference"><%= link_to admin_site_preference_path(@site), :class => active_for_action('sites', 'preference') do %><span><i class="icons-cog"></i></span><%end%></li>
+
 				<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>
diff --git a/app/views/admin/sites/preference.html.erb b/app/views/admin/sites/preference.html.erb
new file mode 100644
index 000000000..1ce43e46c
--- /dev/null
+++ b/app/views/admin/sites/preference.html.erb
@@ -0,0 +1,5 @@
+<% content_for :side_bar do %>
+  <%= render :partial => 'layouts/side_bar', :locals => {:link_name => t('site.settings'), :link_url => admin_site_site_info_path(@site), :icon => 'icons-cog', :side_bar_content => 'admin/sites/side_bar'} %>
+<% end %>
+
+system_info.html.erb
\ No newline at end of file
diff --git a/app/views/admin/sites/search_engine.html.erb b/app/views/admin/sites/search_engine.html.erb
index 7a7f1cdc0..f9777fd02 100644
--- a/app/views/admin/sites/search_engine.html.erb
+++ b/app/views/admin/sites/search_engine.html.erb
@@ -14,106 +14,84 @@
     <%= javascript_include_tag 'lib/site_set' %>  
 </head>
 
-     <%= form_for @site, :url => admin_site_path(@site), :html => {:class => "form-horizontal main-forms"} do |f| %>
+<%= form_for @site, :url => admin_site_path(@site), :html => {:class => "form-horizontal main-forms"} do |f| %>
 
           <fieldset>
+
+            
             <!-- Input Area -->
             <div class="input-area">
 
-              <!-- Language Tabs -->
-              <div class="nav-name"><strong>Language</strong></div>
-              <ul class="nav nav-pills language-nav">
-                <% @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)  %>
-                <% end %>
-              </ul>
 
-              <!-- Language -->
-              <div class="tab-content language-area">
+              <!-- Title-->
+              <div class="control-group input-title">
+                <label class="control-label muted">Google Search Syntax</label>
+                <div class="controls">
+                  <%= text_field_tag 'site[search][sitesearch]',(@site.search["sitesearch"] rescue nil),{ :class => "input-block-level" ,:placeholder => t("search.sitesearch") }%>
+                </div>
+              </div>
 
-                 <% @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 input-title">
-                    <label class="control-label muted"><%= t 'site.title' %></label>
-                    <div class="controls">
-                     <%= f.fields_for :title_translations do |f| %>
-                     <%= f.text_field locale, :class => "input-xxlarge", :value => (@site.title_translations[locale] rescue nil) %>
+              <!-- CKeditor Site Header -->
+              <div class="control-group input-content">
+                <label class="control-label muted">Google Analytics Code</label>
+                <div class="controls">
+                  <div class="textarea">
+                    <%= f.text_area :google_analytics, :class => "input-block-level"%>
+                  </div>
+                </div>
+              </div>
+
+              <hr>
+
+            <% @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 muted">Site Keywords</label>
+                <div class="controls">
+                  <div class="tab-content textarea-lang">
+                    <div class="btn-group" data-toggle="buttons-radio">
+                     <% @site_valid_locales.each do |locale|%>
+                      <%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => "btn #{(active_when_current_locale_eq locale)}"  %>
+                      <% end %>
+                    </div>
+                    <div class="tab-pane fade active in" id="keywords_en_0">
+                      <%= f.fields_for :keywords do |f| %>
+                        <%= f.text_area locale, :class => "resizable",:rows=>3, :value => (@site.keywords(locale) rescue nil) %>
+                       <% end %>
+                    </div>
+                    </div>
+                  </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 muted">Site Description</label>
+                <div class="controls">
+                  <div class="tab-content textarea-lang">
+                    <div class="btn-group" data-toggle="buttons-radio">
+                    <% @site_valid_locales.each do |locale|%>
+                      <%= content_tag :li, link_to(I18nVariable.from_locale(locale), ".#{locale}", :data => {:toggle => "tab"}), :class => "btn #{(active_when_current_locale_eq locale)}"  %>
+                      <% end %>
+                    </div>
+                    <div class="tab-pane fade active in" id="description_en_0">
+                     <%= f.fields_for :description do |f| %>
+                        <%= f.text_area locale, :class => "resizable",:rows=>3, :value => (@site.description(locale) rescue nil) %>
                        <% end %>
                     </div>
                   </div>
-                  <% end %>
-                 <% end %>
-
-                  <!-- Always shoe in the title bar -->
-                  <div class="control-group">
-                    <label class="control-label muted">Always show in the title bar
-                    </label>
-                    <div class="controls">
-                      <%= f.check_box :title_always_on, :class => "toggle-check" %> 
-                    </div>
-                  </div>
-
-                  <hr>
-
-                  <!-- CKeditor Site Header -->
-                  <% @site_valid_locales.each do |locale|%>
-                  <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-                    <label class="control-label muted"><%= t('site.header')%></label>
-                    <div class="controls">
-                      <div class="textarea">
-                        <%= f.fields_for :sub_menu_translations do |f| %>
-                          <%= f.text_area locale, :class => "ckeditor input-block-level", :value => (@site.sub_menu_translations[locale] rescue nil) %>
-                        <% end %>
-                      </div>
-                     </div>
-                     <%end%>
-                    <%end%>
-
-                  <!-- Sitemap menu in Header -->
-                  <div class="control-group">
-                    <label class="control-label muted">Sitemap menu in header
-                    </label>
-                    <div class="controls">
-                      <input type="checkbox" class="toggle-check" data-disabled="true">
-                    </div>
-                  </div>
-
-                  <hr>
-
-                  <!-- Terms of Use -->
-                  <div class="control-group">
-                    <label class="control-label muted">Terms of Use
-                    </label>
-                    <div class="controls">
-                      <input type="checkbox" class="toggle-check terms" data-disabled="true" checked="checked">
-                    </div>
-                  </div>
-
-                  <!-- CKeditor Default Terms of Use -->
-                  <div class="control-group input-content hide">
-                  <% @site_valid_locales.each do |locale|%>
-                  <%= content_tag :div, :class => "tab-pane fade #{active_when_current_locale_eq locale} #{locale}" do %>
-                    <label class="control-label muted">Default Terms of Use</label>
-                    <div class="controls">
-                      <div class="textarea">
-                       <%= f.fields_for :terms_of_user_translations do |f| %>
-                          <%= f.text_area locale, :class => "ckeditor input-block-level", :value => (@site.terms_of_user_translations[locale] rescue nil) %>
-                        <% end %>
-                        </div>
-                      </div>
-                    </div>
-                    <%end%>
-                    <%end%>
-
                 </div>
-                 <!-- Form Actions -->
-                <div class="form-actions">
-                  <%= f.submit t("submit"), :class => "btn btn-primary" %>
-                  <%= f.submit t("cancel"), :class => "btn ", :type => 'reset' %>
-                </div>
-
+              </div>
+              <%end%> 
+              <%end%> 
+            </div>
+            <!-- Form Actions -->
+            <div class="form-actions">
+              <%= f.submit t("submit"), :class => "btn btn-primary" %>
+              <%= f.submit t("cancel"), :class => "btn ", :type => 'reset' %>
             </div>
 
-          </fieldset>
-        <% end %>
\ No newline at end of file
+          </fieldset>          
+<% end %>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 01fb03fe2..7a0bbdbb0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -197,6 +197,7 @@ Orbit::Application.routes.draw do
       get 'system_info'
       get 'ui_theme'
       get 'change_design'
+      get 'preference'
     end
 
     resources :tags do