diff --git a/app/views/admin/settings.html.erb b/app/views/admin/settings.html.erb
new file mode 100644
index 000000000..6af25b41e
--- /dev/null
+++ b/app/views/admin/settings.html.erb
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+ <%= bootstrap_form_tag url: update_settings_path, method: 'put' do |f| %>
+
+ <%= f.text_field 'settings.site_name', value: AppSettings['settings.site_name'], label: "Site Name" %>
+ <%= f.text_field 'settings.parent_site', value: AppSettings['settings.parent_site'], label: "Parent Site" %>
+ <%= f.text_field 'settings.parent_company', value: AppSettings['settings.parent_company'], label: "Parent Company" %>
+ <%= f.text_field 'settings.site_tagline', value: AppSettings['settings.site_tagline'], label: "Site Tagline" %>
+ <%#= f.text_field 'settings.product_name', value: AppSettings['settings.product_name'], label: "Product Name" %>
+ <%#= f.text_field 'settings.support_phone', value: AppSettings['settings.support_phone'], label: "Support Phone" %>
+ <%= f.text_field 'settings.google_analytics_id', value: AppSettings['settings.google_analytics_id'], label: "Google Analytics ID" %>
+
+
+
+
+ <%= image_tag(AppSettings['design.header_logo'], width: 40, class: 'pull-left') %>
+
+
+ <%= f.text_field 'design.header_logo', value: AppSettings['design.header_logo'], label: "Header Logo" %>
+
+
+
+
+ <%= image_tag(AppSettings['design.footer_mini_logo'], width: 20, class: 'pull-left') %>
+
+
+ <%= f.text_field 'design.footer_mini_logo', value: AppSettings['design.footer_mini_logo'], label: "Footer Logo" %>
+
+
+
+
+ <%= image_tag(AppSettings['design.favicon'], width: 32, class: 'pull-left') %>
+
+
+ <%= f.text_field 'design.favicon', value: AppSettings['design.favicon'], label: "Favicon" %>
+
+
+
+ <%= f.text_field 'css.search_background', value: AppSettings['css.search_background'], label: "Search Background Color", class: 'pick-a-color' %>
+ <%= f.text_field 'css.top_bar', value: AppSettings['css.top_bar'], label: "Header Accent", class: 'pick-a-color' %>
+ <%= f.text_field 'css.link_color', value: AppSettings['css.link_color'], label: "Link Color", class: 'pick-a-color' %>
+ <%= f.text_field 'css.form_background', value: AppSettings['css.form_background'], label: "Add Form Background", class: 'pick-a-color' %>
+ <%= f.text_field 'css.still_need_help', value: AppSettings['css.still_need_help'], label: "Still Need Help Background", class: 'pick-a-color' %>
+
+
+
+ Supported Locales:
+ <% I18n.available_locales.each do |locale| %>
+ <%= f.check_box 'i18n.available_locales', { multiple: true, label: I18n.translate("language_name", locale: locale.to_s), checked: AppSettings['i18n.available_locales'].include?(locale.to_s) }, "#{locale}", nil %>
+ <% end %>
+
+ <%= select_default_locale %>
+
+
+
+
+ <%= f.submit "Save Settings", class: 'btn btn-warning' %>
+
+ <% end %>
+
+
diff --git a/app/views/admin/tickets.js.erb b/app/views/admin/tickets.js.erb
index 485cd820b..af02f7c66 100644
--- a/app/views/admin/tickets.js.erb
+++ b/app/views/admin/tickets.js.erb
@@ -1,6 +1,9 @@
$('#tickets').html("<%= escape_javascript(render 'admin/tickets') %>");
$('.ticket-stats').html("<%= j render 'admin/ticket_stats' %>");
$('#user-info').html("<%= j render 'admin/user_info_horizontal' if @user %>");
+<% if params[:mode] == 'edit' # This is used when the admin clicks edit from user search %>
+$('#user-info-horizontal').html("<%= j render partial: 'admin/edit_user' %>");
+<% end %>
<% if @user %>
window.location.hash = 'user_profile_<%= @user.id %>';
diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb
index e962054b4..673d146f0 100644
--- a/app/views/admin/users.html.erb
+++ b/app/views/admin/users.html.erb
@@ -1,5 +1,8 @@
-
-
+
+
+
+
+
<%= render 'users' %>
-
+
diff --git a/app/views/admin/users.js.erb b/app/views/admin/users.js.erb
index 7e2fc1758..9ea515687 100644
--- a/app/views/admin/users.js.erb
+++ b/app/views/admin/users.js.erb
@@ -2,8 +2,8 @@ $('#tickets').html("<%= escape_javascript(render 'users') %>");
//$('#left-col-ticket-nav').html("<%= escape_javascript(render 'ticket_nav') %>");
$('.ticket-stats').html("<%= j render 'admin/ticket_stats' %>");
$('#user-info').html("<%= j render 'admin/user_info_horizontal' if @user %>");
-$('#ticket-page-title').html("<%= t(:users_found, count: @users.size, query: params[:q].titleize, default: 'Search Results') %>: <%= status_label(@status) if @status %>
<%= j link_to t(:open_new_discussion, default: 'Open Discussion'), admin_new_ticket_path, remote: true, class: 'btn btn-primary' %><%= escape_javascript(render 'admin/ticket_nav_dropdown') %>");
-$(document).prop('title', "Discussion Management: <%= @status.titleize if @status %>");
+$('#ticket-page-title').html("<%= t(:users_found, count: @users.size, query: params[:q].titleize, default: 'Search Results') unless params[:q] == 'users'%> <%= status_label(@status) if @status %>
<%= j link_to t(:open_new_discussion, default: 'Open Discussion'), admin_new_ticket_path, remote: true, class: 'btn btn-primary' %><%= escape_javascript(render 'admin/ticket_nav_dropdown') %>");
+//$(document).prop('title', "Discussion Management: <%= @status.titleize if @status %>");
window.location.hash = 'users';
// Empty ticket search field
diff --git a/app/views/categories/edit.html.erb b/app/views/categories/edit.html.erb
index 64270b2eb..d9e437ed4 100644
--- a/app/views/categories/edit.html.erb
+++ b/app/views/categories/edit.html.erb
@@ -5,7 +5,7 @@
<%= t(:edit_category, default: 'Edit Category') %>: <%- @category.name %>
-<%= locale_select if I18n.available_locales.count > 1 %>
+<%= locale_select if AppSettings['i18n.available_locales'].count > 1 %>
<%= bootstrap_form_for @category, url: category_path(id: @category.id), label_errors: true, method: 'patch' do |f| %>
<% Globalize.with_locale(params['lang']) do %>
diff --git a/app/views/docs/edit.html.erb b/app/views/docs/edit.html.erb
index d4880c9a4..56fd37399 100644
--- a/app/views/docs/edit.html.erb
+++ b/app/views/docs/edit.html.erb
@@ -1,5 +1,5 @@
-<%= locale_select if I18n.available_locales.count > 1 %>
+<%= locale_select if AppSettings['i18n.available_locales'].count > 1 %>
<%= bootstrap_form_for :doc, url: category_doc_path(category_id: @category.id, id: @doc.id), :method => 'patch' do |f| %>
<% Globalize.with_locale(params['lang']) do %>
diff --git a/app/views/layouts/_above_header.html.erb b/app/views/layouts/_above_header.html.erb
index 4167c268a..a8cdd2697 100644
--- a/app/views/layouts/_above_header.html.erb
+++ b/app/views/layouts/_above_header.html.erb
@@ -1,15 +1,15 @@
-<%= link_to "#{t(:back_to, default: "Back to")} #{Settings.parent_company}", Settings.parent_site %> |
+<%= link_to "#{t(:back_to, default: "Back to")} #{AppSettings['settings.parent_company']}", AppSettings['settings.parent_site'] %> |
<% unless user_signed_in? %>
<%= link_to t('devise.sessions.new.sign_in'), '#', class: 'login-link', data: {toggle: "modal", target: "#login-modal"} %>
<% else %>
<%= link_to t(:your_profile, :username => current_user.name), edit_user_registration_path %> | <%= link_to('Admin', admin_path) + " | " if current_user.admin? %><%= link_to t(:logout), destroy_user_session_path %>
<% end %>
-<% if I18n.available_locales.count > 1 %>
+<% if AppSettings['i18n.available_locales'].count > 1 %>
|
<%= "#{I18n.locale.upcase}" %>
diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
index 75eb98bd2..1e5712d3c 100644
--- a/app/views/layouts/_footer.html.erb
+++ b/app/views/layouts/_footer.html.erb
@@ -1,7 +1,7 @@