diff --git a/.travis.yml b/.travis.yml
index 24dc7f94c7..ae9f3c8339 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.7
+  - 2.5.1
 before_install:
   - gem install bundler
   - cp -r install/game.distr game
diff --git a/Gemfile b/Gemfile
index e6e4470ede..6839e7927b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,17 +17,14 @@ gem 'dentaku', '~>3.1'
 gem 'json', '~> 2.1.0'
 gem 'redcarpet', '~> 3.4.0'
 gem 'html2markdown', '0.0.3'
-gem 'sinatra', '~> 2.0.1'
+gem 'sinatra', '~> 2.0.4'
 gem 'thin', '~> 1.7.2'
-gem 'sinatra-reloader', '~> 1.0'
-gem 'sinatra-flash', '~> 0.3.0'
 gem 'sinatra-cross_origin', '~>0.4.0'
 gem 'aws-sdk-s3', '~> 1.8.2'
-gem 'redis-rack', '~> 2.0.4'
 gem 'rubyzip',  '~> 1.2.2'
 gem 'diff-lcs', '~> 1.3'
 gem 'diffy', '~> 3.2.0'
 gem 'nokogiri', '~> 1.8.2'
-gem 'sass', '~>3.5.5'
+gem 'sassc', '~> 2.0.0'
 gem 'htmlentities', '~>4.3.4'
 gem 'handlebars', '~>0.8.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 24b1266592..5458417523 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -20,7 +20,6 @@ GEM
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.2)
-    backports (3.11.1)
     bcrypt (3.1.11)
     concurrent-ruby (1.0.5)
     daemons (1.2.6)
@@ -32,7 +31,7 @@ GEM
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
     eventmachine (1.2.5)
-    ffi (1.9.23)
+    ffi (1.9.25)
     handlebars (0.8.0)
       handlebars-source (~> 4.0.5)
       therubyracer (~> 0.12.1)
@@ -50,8 +49,7 @@ GEM
     log4r (1.1.10)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    multi_json (1.13.1)
-    mustermann (1.0.2)
+    mustermann (1.0.3)
     nest (3.1.1)
       redic
     nokogiri (1.8.2)
@@ -60,22 +58,13 @@ GEM
       nest (~> 3)
       redic (~> 1.5.0)
       stal
-    rack (2.0.4)
-    rack-protection (2.0.1)
+    rack (2.0.6)
+    rack-protection (2.0.4)
       rack
     rake (12.3.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
     redcarpet (3.4.0)
     redic (1.5.0)
       hiredis
-    redis (4.0.1)
-    redis-rack (2.0.4)
-      rack (>= 1.5, < 3)
-      redis-store (>= 1.2, < 2)
-    redis-store (1.4.1)
-      redis (>= 2.2, < 5)
     ref (2.0.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -91,28 +80,15 @@ GEM
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
     rubyzip (1.2.2)
-    sass (3.5.5)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sinatra (2.0.1)
+    sassc (2.0.0)
+      ffi (~> 1.9.6)
+      rake
+    sinatra (2.0.4)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.1)
+      rack-protection (= 2.0.4)
       tilt (~> 2.0)
-    sinatra-contrib (2.0.1)
-      backports (>= 2.0)
-      multi_json
-      mustermann (~> 1.0)
-      rack-protection (= 2.0.1)
-      sinatra (= 2.0.1)
-      tilt (>= 1.3, < 3)
     sinatra-cross_origin (0.4.0)
-    sinatra-flash (0.3.0)
-      sinatra (>= 1.0.0)
-    sinatra-reloader (1.0)
-      sinatra-contrib
     stal (0.3.0)
       redic (~> 1.5)
     therubyracer (0.12.3)
@@ -152,16 +128,13 @@ DEPENDENCIES
   ohm (~> 3.1.1)
   rake (~> 12.3)
   redcarpet (~> 3.4.0)
-  redis-rack (~> 2.0.4)
   rspec (~> 3.7.0)
   rubyzip (~> 1.2.2)
-  sass (~> 3.5.5)
-  sinatra (~> 2.0.1)
+  sassc (~> 2.0.0)
+  sinatra (~> 2.0.4)
   sinatra-cross_origin (~> 0.4.0)
-  sinatra-flash (~> 0.3.0)
-  sinatra-reloader (~> 1.0)
   thin (~> 1.7.2)
   timezone (~> 1.2.10)
 
 BUNDLED WITH
-   1.16.1
+   1.16.3
diff --git a/bin/setup_server b/bin/setup_server
index 6421bd3f88..b0bfd37607 100755
--- a/bin/setup_server
+++ b/bin/setup_server
@@ -118,7 +118,7 @@ if [ -e /etc/rc.local ]
 then
     sed -i -e '$i \/root/onboot.sh &\n' /etc/rc.local
 else
-    printf '%s\n' '#!/bin/bash' '/root/onboot.sh' 'exit 0' | sudo tee -a /etc/rc.local
+    printf '%s\n' '#!/bin/bash' '/root/onboot.sh &\n' 'exit 0' | sudo tee -a /etc/rc.local
 fi
 
 sudo chmod +x /etc/rc.local
diff --git a/config.ru b/config.ru
deleted file mode 100644
index b3b9bd1026..0000000000
--- a/config.ru
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'rubygems'
-require 'bundler'
-
-Bundler.require
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'lib'))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'website'))
-
-require 'sinatra/base'
-require 'thin'
-require "sinatra/reloader"
-require 'sinatra/flash'
-require 'compass'
-require 'redis-rack'
-require 'diff/lcs'
-
-require 'aresmush'
-
-require 'web_server.rb'
-require 'web_bootstrapper.rb'
-require 'web_notifier.rb'
-require 'engine_api_connector.rb'
-
-bootstrapper = AresMUSH::WebBootstrapper.new
-bootstrapper.start
-
-run AresMUSH::WebApp
\ No newline at end of file
diff --git a/engine/aresmush.rb b/engine/aresmush.rb
index 468ce792c3..accc85fe02 100644
--- a/engine/aresmush.rb
+++ b/engine/aresmush.rb
@@ -28,11 +28,10 @@
 
 require 'sinatra/base'
 require 'sinatra/cross_origin'
-require 'sinatra/reloader'
 require 'thin'
 require 'rubygems'
 require 'zip'
-require 'sass'
+require 'sassc'
 
 module AresMUSH
     
diff --git a/engine/styles/ares.scss b/engine/styles/ares.scss
index 31e5e66f41..97a11693dd 100644
--- a/engine/styles/ares.scss
+++ b/engine/styles/ares.scss
@@ -144,7 +144,7 @@ a:focus{
 }
 
 .navbar {
-  z-index: 9999;
+  z-index: 2000;
 }
 
 .navbar-collapse.in {
@@ -354,6 +354,10 @@ mark {
     padding: 10px;
 }
 
+.modal {
+  z-index: 3000;
+}
+
 /* -------------------------
 GOOGLE SEARCH OVERRIDES
 ------------------------- */
@@ -487,6 +491,9 @@ SIDEBAR
     text-align: center;
     font-size: 1.5em;
     color: $faded-text-color;
+    padding: 0px;
+    margin-top: 20px;
+    margin-bottom: 10px;
 }
 
 .search-bar {
@@ -956,7 +963,7 @@ input[type='file'] {
 
 /*.char-scene-list li:before { content: "\2666  "; }*/
 
-@media (max-width:800px)  { 
+@media (max-width:992px)  { 
 
 .profile-wrap { 
     padding: 10px; 
@@ -981,6 +988,31 @@ input[type='file'] {
     padding-right: 0px;
 }
 
+
+.body-row 
+{
+  display: flex;
+  flex-direction: column;
+  
+}
+
+.left-sidebar {
+  order: 2;
+}
+
+.right-sidebar {
+  order: 2;
+}
+
+.left-body {
+  order: 1;
+}
+
+.right-body {
+  order: 1;
+}
+
+
 }
 
 @import "custom_style";
\ No newline at end of file
diff --git a/install/game.distr/config/demographics.yml b/install/game.distr/config/demographics.yml
index d5329a6cbd..67b37bd004 100644
--- a/install/game.distr/config/demographics.yml
+++ b/install/game.distr/config/demographics.yml
@@ -107,3 +107,4 @@ demographics:
     width: 20
     title: Position
     value: Position
+  private_properties: []
diff --git a/install/game.distr/config/website.yml b/install/game.distr/config/website.yml
index 2ce6562bd2..46e5a09ea6 100644
--- a/install/game.distr/config/website.yml
+++ b/install/game.distr/config/website.yml
@@ -1,20 +1,127 @@
 ---
 website:
+  allow_html_in_markdown: true
+  character_gallery_group: Faction
+  character_gallery_subgroup: Position
+  left_sidebar: false
+  max_upload_size_kb: 5000
+  portal_requires_registration: false
+  restricted_pages:
+  - home
   sitemap_update_cron:
     hour:
     - 2
     minute:
     - 17
-  allow_html_in_markdown: true
-  max_upload_size_kb: 5000
-  character_gallery_group: Faction
-  character_gallery_subgroup: Position
-  portal_requires_registration: false
+  top_navbar:
+  - menu:
+    - page: chargen
+      title: Create a Character
+    - page: roster
+      title: Pre-Made Characters
+    - page: who
+      title: Who's Online
+    - divider: true
+    - page: scenes-live
+      title: Active Scenes
+    - page: scene-create
+      title: Start New Scene
+    - divider: true
+    - page: play
+      title: Play via Web Client
+    title: Play
+  - title: Story
+    menu:
+    - page: characters
+      title: Characters
+    - page: scenes
+      title: Scenes
+    - page: plots
+      title: Plots
+  - title: Community
+    menu:
+    - page: chat
+      title: Chat
+    - page: forum
+      title: Forum
+    - page: events
+      title: Events
+    - page: players
+      title: Players
+  - title: Directory
+    menu:
+    - page: characters
+      title: Characters
+    - page: census
+      title: Census
+    - page: actors
+      title: Actors
+    - page: roster
+      title: Roster
+    - divider: true
+    - page: scenes
+      title: Scenes
+    - page: plots
+      title: Plots
+    - page: locations
+      title: Locations
+    - page: combats
+      title: Combats
+    - divider: true
+    - page: files
+      title: Files
+  - title: FS3
+    menu:
+    - page: fs3skills-abilities
+      title: Abilities List
+    - page: fs3combat-gear
+      title: Gear List
+    - divider: true
+    - target: blank
+      title: Player's Guide <i class="fa fa-external-link-alt" aria-hidden="true">
+      url: http://aresmush.com/fs3/fs3-3
+    - target: blank
+      title: Combat Quick Reference <i class="fa fa-external-link-alt" aria-hidden="true">
+      url: http://aresmush.com/fs3/fs3-3/combat-quickref
+    - target: blank
+      title: Interactive Combat Walkthrough <i class="fa fa-external-link-alt" aria-hidden="true">
+      url: http://aresmush.com/fs3/fs3-3/combat-walkthrough
+  - title: Wiki
+    menu:
+    - page: wiki
+      title: Home
+    - divider: true
+    - page: wiki-create
+      title: Create New Page
+    - page: wiki-all
+      title: All Pages
+    - page: search-wiki
+      title: Search Wiki
+    - page: wiki-tags
+      title: Tags
+    - page: recent-changes
+      title: Recent Changes
+    - divider: true
+    - page: files
+      title: Files
+    - page: help-topic
+      id: markdown
+      title: Markdown Reference
+  - title: Help
+    menu:
+    - page: help
+      title: Game Help
+    - page: search-wiki
+      title: Search
+    - page: help-topic
+      id: markdown
+      title: Markdown Reference
+    - divider: true
+    - target: blank
+      title: MUSH 101 Tutorial <i class="fa fa-external-link-alt" aria-hidden="true">
+      url: https://aresmush.com/mush-101/
+    - page: jobs
+      title: Requests
   website_code_path: "/home/ares/ares-webportal"
-  left_sidebar: false
-  wiki_nav:
-  - Home
   wiki_aliases:
     main: home
-  restricted_pages:
-  - home
diff --git a/install/migrations/0017_beta32_update.rb b/install/migrations/0017_beta32_update.rb
new file mode 100644
index 0000000000..4b67cb28e8
--- /dev/null
+++ b/install/migrations/0017_beta32_update.rb
@@ -0,0 +1,39 @@
+module AresMUSH  
+  module Migrations
+    class MigrationBeta32Update
+      def require_restart
+        false
+      end
+      
+      def migrate
+        Global.logger.debug "Adding default top nav."
+
+        default_config = DatabaseMigrator.read_distr_config_file("website.yml")
+
+        config = DatabaseMigrator.read_config_file("website.yml")
+        config['website'].delete 'wiki_nav'
+        config['website']['top_navbar'] = default_config['website']['top_navbar']
+        DatabaseMigrator.write_config_file("website.yml", config)    
+         
+         
+        Global.logger.debug "Adding private demographics"
+        config = DatabaseMigrator.read_config_file("demographics.yml")
+        config['demographics']['private_properties'] = []
+        DatabaseMigrator.write_config_file("demographics.yml", config)    
+        
+        Global.logger.debug "Normalize group names"
+        
+        Character.all.each do |c|
+          new_groups = {}
+          if (c.groups)
+            c.groups.each do |k, v|
+              new_groups[k.downcase] = v
+            end
+          end
+          c.update(groups: new_groups)
+        end
+        
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/plugins/chargen/web/chargen_info_request_handler.rb b/plugins/chargen/web/chargen_info_request_handler.rb
index c078b504a0..4f01147152 100644
--- a/plugins/chargen/web/chargen_info_request_handler.rb
+++ b/plugins/chargen/web/chargen_info_request_handler.rb
@@ -40,6 +40,7 @@ def handle(request)
         {
           fs3: fs3,
           group_options: groups,
+          demographics: Demographics.public_demographics.map { |d| d.titlecase },
           date_format: Global.read_config("datetime", "date_entry_format_help"),
           bg_blurb: Website.format_markdown_for_html(Global.read_config("chargen", "bg_blurb")),
           hooks_blurb: Website.format_markdown_for_html(Global.read_config("chargen", "hooks_blurb")),
diff --git a/plugins/demographics/helpers.rb b/plugins/demographics/helpers.rb
index b99c13bf6b..88fb9c91d2 100644
--- a/plugins/demographics/helpers.rb
+++ b/plugins/demographics/helpers.rb
@@ -47,7 +47,7 @@ def self.census_by(&block)
     
     def self.set_group(char, group_name, group)
       groups = char.groups
-      groups[group_name] = group
+      groups[group_name.downcase] = group
       char.update(groups: groups)      
     end
     
diff --git a/plugins/demographics/public/demo_char.rb b/plugins/demographics/public/demo_char.rb
index e1543a22df..8dd542b397 100644
--- a/plugins/demographics/public/demo_char.rb
+++ b/plugins/demographics/public/demo_char.rb
@@ -14,7 +14,7 @@ def actor
     end
     
     def demographic(key)
-      name = key.to_s
+      name = key.to_s.downcase
       return self.birthdate if name == "birthdate"
       demo = self.demographics[name]
       return demo.blank? ? nil : demo
@@ -32,7 +32,7 @@ def update_demographic(key, value)
     end
     
     def group(name)
-      self.groups[name]
+      self.groups[name.downcase]
     end
   end
   
diff --git a/plugins/demographics/public/demographics_api.rb b/plugins/demographics/public/demographics_api.rb
index 28f66e5189..14789fdac3 100644
--- a/plugins/demographics/public/demographics_api.rb
+++ b/plugins/demographics/public/demographics_api.rb
@@ -9,10 +9,36 @@ def self.basic_demographics
       basic_demographics.delete 'actor'
       basic_demographics
     end
+    
+    def self.public_demographics
+      demographics = Demographics.basic_demographics
+      Demographics.private_demographics.each do |d|
+        demographics.delete d
+      end
+      demographics
+    end
+    
+    def self.visible_demographics(char, viewer)
+      show_all = viewer && (viewer == char || viewer.has_permission?("manage_demographics"))
+
+      demographics = Demographics.basic_demographics
+
+      if (!show_all)
+        Demographics.private_demographics.each do |d|
+          demographics.delete d
+        end
+      end
+      
+      demographics
+    end
             
     def self.required_demographics
       Global.read_config("demographics", "required_properties")
     end
+
+    def self.private_demographics
+      Global.read_config("demographics", "private_properties")
+    end
     
     def self.name_and_nickname(char)
       return nil if !char
diff --git a/plugins/describe/templates/room_template.rb b/plugins/describe/templates/room_template.rb
index 39dae0ca35..b6c0751fea 100644
--- a/plugins/describe/templates/room_template.rb
+++ b/plugins/describe/templates/room_template.rb
@@ -86,8 +86,8 @@ def foyer_status(e, i)
           status = t('describe.foyer_room_occupied')
         end
         linebreak = i % 2 == 0 ? "%R          " : ""
-        room_name = "#{e.dest.name} (#{status})"
-        "#{linebreak}%xh#{exit_name(e)}]%xn #{left(room_name,29)}"
+        room_name = "#{exit_destination(e)} (#{status})"
+        "#{linebreak}%xh#{exit_name(e)}%xn #{left(room_name,29)}"
       end
       
       def char_shortdesc(char)
diff --git a/plugins/events/commands/event_signup_cmd.rb b/plugins/events/commands/event_signup_cmd.rb
index 0cad5b5b17..eb0bb334b1 100644
--- a/plugins/events/commands/event_signup_cmd.rb
+++ b/plugins/events/commands/event_signup_cmd.rb
@@ -7,26 +7,19 @@ class EventSignupCmd
       attr_accessor :num, :comment
       
       def parse_args
-        args = cmd.parse_args(ArgParser.arg1_equals_arg2)
+        args = cmd.parse_args(ArgParser.arg1_equals_optional_arg2)
         self.num = integer_arg(args.arg1)
         self.comment = trim_arg(args.arg2)
       end
       
       def required_args
-        [ self.num, self.comment ]
+        [ self.num ]
       end
       
       def handle
         Events.with_an_event(self.num, client, enactor) do |event| 
-          signup = event.signups.select { |s| s.character == enactor }.first
-          
-          if (signup)
-            signup.update(comment: self.comment)
-          else
-            EventSignup.create(event: event, character: enactor, comment: self.comment)
-          end
+          Events.signup_for_event(event, enactor, self.comment)
           client.emit_success t('events.signed_up')
-          
         end
       end
     end
diff --git a/plugins/events/events.rb b/plugins/events/events.rb
index 7c7c3e610d..ea25260946 100644
--- a/plugins/events/events.rb
+++ b/plugins/events/events.rb
@@ -60,6 +60,10 @@ def self.get_web_request_handler(request)
          return DeleteEventRequestHandler
        when "upcomingEvents"
          return UpcomingEventsRequestHandler
+       when "eventSignup"
+         return EventSignupRequestHandler
+       when "eventCancelSignup"
+         return EventCancelSignupRequestHandler
        end
        nil
     end
diff --git a/plugins/events/help/en/events.md b/plugins/events/help/en/events.md
index 37289ce29f..a1122d566f 100644
--- a/plugins/events/help/en/events.md
+++ b/plugins/events/help/en/events.md
@@ -28,7 +28,7 @@ You can create and edit your own events.  Characters with the `manage_events` pe
 
 ## Signing Up For Events
 
-You can indicate your interest in an event by signing up for it.  Ultimately it is up to the event organizer how to handle signups: first-come-first-served, etc.  It's best to set expectations in the events description.
+You can indicate your interest in an event by signing up (aka RSVP-ing) for it.  Ultimately it is up to the event organizer how to handle signups: first-come-first-served, etc.  It's best to set expectations in the events description.
 
 `event/signup <#>=<comment>` - Sign up for an event.  If already signed up, this command can be used to change your comment.
 `event/cancel <#>` - Removes your signup.
diff --git a/plugins/events/helpers.rb b/plugins/events/helpers.rb
index e11c034cb8..e6ec0c58c6 100644
--- a/plugins/events/helpers.rb
+++ b/plugins/events/helpers.rb
@@ -41,6 +41,16 @@ def self.can_manage_event(enactor, event)
       return Events.can_manage_events?(enactor) || enactor == event.character
     end
     
+    def self.signup_for_event(event, char, comment)
+      signup = event.signups.select { |s| s.character == char }.first
+      
+      if (signup)
+        signup.update(comment: comment)
+      else
+        EventSignup.create(event: event, character: char, comment: comment)
+      end
+    end
+    
     def self.create_event(enactor, title, datetime, desc)
       event = Event.create(title: title, 
       starts: datetime, 
diff --git a/plugins/events/templates/event_detail.erb b/plugins/events/templates/event_detail.erb
index 58eb7db935..c22d18da16 100644
--- a/plugins/events/templates/event_detail.erb
+++ b/plugins/events/templates/event_detail.erb
@@ -10,7 +10,7 @@
 %xh<%= t('events.signups')%>%xn
 
 <% event.ordered_signups.each_with_index do |s, i| %>
-<%= left("#{i+1}.", 3) %><%= s.character.name %> - <%= s.comment %>
+<%= left("#{i+1}.", 3) %><%= s.character.name %> <%= signup_comment(s) %>
 <% end %>
 
 %lf
\ No newline at end of file
diff --git a/plugins/events/templates/event_detail_template.rb b/plugins/events/templates/event_detail_template.rb
index 81fb9c4ae1..2ff38351d7 100644
--- a/plugins/events/templates/event_detail_template.rb
+++ b/plugins/events/templates/event_detail_template.rb
@@ -17,6 +17,10 @@ def start_datetime_local
       def start_time_standard
         @event.start_time_standard
       end
+      
+      def signup_comment(signup)
+        signup.comment ? "- #{signup.comment}" : ""
+      end
     end
   end
 end
diff --git a/plugins/events/web/event_cancel_signup_request_handler.rb b/plugins/events/web/event_cancel_signup_request_handler.rb
new file mode 100644
index 0000000000..582af19d33
--- /dev/null
+++ b/plugins/events/web/event_cancel_signup_request_handler.rb
@@ -0,0 +1,28 @@
+module AresMUSH
+  module Events
+    class EventCancelSignupRequestHandler
+      def handle(request)
+        event_id = request.args[:event_id]
+        comment = request.args[:comment]
+        enactor = request.enactor
+        
+        event = Event[event_id.to_i]
+        if (!event)
+          return { error: t('webportal.not_found') }
+        end
+        
+        error = Website.check_login(request)
+        return error if error
+              
+        signup = event.signups.select { |s| s.character == enactor }.first
+        if (signup)
+          signup.delete
+        end
+        
+        {}
+      end
+    end
+  end
+end
+
+
diff --git a/plugins/events/web/event_request_handler.rb b/plugins/events/web/event_request_handler.rb
index e4d0be57b9..e2238bb005 100644
--- a/plugins/events/web/event_request_handler.rb
+++ b/plugins/events/web/event_request_handler.rb
@@ -22,13 +22,20 @@ def handle(request)
           description = Website.format_markdown_for_html(event.description)
         end
         
+        if (enactor)
+          current_signup = event.signups.select { |s| s.character == enactor }.first
+        else
+          current_signup = nil
+        end
+
         signups = event.ordered_signups.map { |s| 
           {
             char: {
                     name: s.char_name,
                     icon: s.character ? Website.icon_for_char(s.character) : nil
                   },
-            comment: s.comment
+            comment: s.comment,
+            author: enactor && s.character == enactor
             }}
                   
         {
@@ -39,6 +46,8 @@ def handle(request)
           date: datetime.before(' '),
           time: datetime.after( ' '),
           signups: signups,
+          signed_up: !!current_signup,
+          signup_comment: current_signup ? current_signup.comment : nil,
           can_manage: enactor && Events.can_manage_event(enactor, event),
           date_entry_format: Global.read_config("datetime", 'date_entry_format_help').upcase,
           start_datetime_local: event.start_datetime_local(request.enactor),
diff --git a/plugins/events/web/event_signup_request_handler.rb b/plugins/events/web/event_signup_request_handler.rb
new file mode 100644
index 0000000000..c8ea303470
--- /dev/null
+++ b/plugins/events/web/event_signup_request_handler.rb
@@ -0,0 +1,25 @@
+module AresMUSH
+  module Events
+    class EventSignupRequestHandler
+      def handle(request)
+        event_id = request.args[:event_id]
+        comment = request.args[:comment]
+        enactor = request.enactor
+        
+        event = Event[event_id.to_i]
+        if (!event)
+          return { error: t('webportal.not_found') }
+        end
+        
+        error = Website.check_login(request)
+        return error if error
+              
+        Events.signup_for_event(event, enactor, comment)
+        
+        {}
+      end
+    end
+  end
+end
+
+
diff --git a/plugins/forum/commands/management/forum_attribute_cmd.rb b/plugins/forum/commands/management/forum_attribute_cmd.rb
index 995eccae18..fd5718a19a 100644
--- a/plugins/forum/commands/management/forum_attribute_cmd.rb
+++ b/plugins/forum/commands/management/forum_attribute_cmd.rb
@@ -61,7 +61,7 @@ class ForumRenameCmd
     
       def handle
         Forum.with_a_category(name, client, enactor) do |category|        
-          category.update(name: self.attribute)
+          category.update(name: titlecase_arg(self.attribute))
           client.emit_success t('forum.category_renamed')
         end
       end
diff --git a/plugins/forum/forum.rb b/plugins/forum/forum.rb
index a355103bd1..c06b13891e 100644
--- a/plugins/forum/forum.rb
+++ b/plugins/forum/forum.rb
@@ -87,6 +87,8 @@ def self.get_web_request_handler(request)
         return ForumUnreadRequestHandler
       when "forumRecent"
         return RecentForumPostsRequestHandler
+      when "searchForum"
+        return SearchForumRequestHandler
       end
     end
     
diff --git a/plugins/forum/web/forum_category_request_handler.rb b/plugins/forum/web/forum_category_request_handler.rb
index 872232c35d..65f4b50ed9 100644
--- a/plugins/forum/web/forum_category_request_handler.rb
+++ b/plugins/forum/web/forum_category_request_handler.rb
@@ -21,6 +21,7 @@ def handle(request)
         posts = category.sorted_posts.reverse
            .map { |p| {
              id: p.id,
+             category_id: p.bbs_board.id,
              title: p.subject,
              unread: enactor && p.is_unread?(enactor),
              date: p.created_date_str(enactor),
@@ -30,6 +31,7 @@ def handle(request)
          {
            id: category.id,
            name: category.name,
+           description: category.description,
            can_post: Forum.can_write_to_category?(enactor, category),
            posts: posts
          }
diff --git a/plugins/forum/web/search_forum_request_handler.rb b/plugins/forum/web/search_forum_request_handler.rb
new file mode 100644
index 0000000000..16212ebb7c
--- /dev/null
+++ b/plugins/forum/web/search_forum_request_handler.rb
@@ -0,0 +1,41 @@
+module AresMUSH
+  module Forum
+    class SearchForumRequestHandler
+      def handle(request)
+
+        searchTitle = (request.args[:searchTitle] || "").strip
+        searchText = (request.args[:searchText] || "").strip
+        searchAuthor = (request.args[:searchAuthor] || "").strip
+        
+        enactor = request.enactor
+        
+        error = Website.check_login(request)
+        return error if error
+        
+        posts = BbsPost.all.select { |p| Forum.can_read_category?(enactor, p.bbs_board) }
+
+        if (!searchText.blank?)
+          posts = posts.select { |p| "#{p.message} #{p.bbs_replies.map { |r| r.message }.join(' ')}" =~ /\b#{searchText}\b/i }
+        end
+        
+        if (!searchTitle.blank?)
+          posts = posts.select { |p| p.subject =~ /\b#{searchTitle}\b/i }
+        end
+        
+        if (!searchAuthor.blank?)
+          posts = posts.select { |p| p.author && (p.author.name.upcase == searchAuthor.upcase) }
+        end
+
+        posts.to_a.sort_by { |p| p.created_at }.reverse
+                   .map { |p| {
+                     id: p.id,
+                     category_id: p.bbs_board.id,
+                     title: p.subject,
+                     unread: enactor && p.is_unread?(enactor),
+                     date: p.created_date_str(enactor),
+                     author: p.author_name,
+                   }}
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/plugins/help/locales/locale_en.yml b/plugins/help/locales/locale_en.yml
index 7804c672f6..b3159b1648 100644
--- a/plugins/help/locales/locale_en.yml
+++ b/plugins/help/locales/locale_en.yml
@@ -16,3 +16,4 @@ en:
         command_help_title: "Command Quick Reference"
         command_help_footer: "For more help, use %xchelp %{topic}%xn or visit the web portal: %{url}."
         beginner_set: "You set your beginner flag to %{option}."
+        pages_tip: "For additional pages, put the page # after the command (e.g. help2, help3, etc.)"
diff --git a/plugins/help/templates/help_list.erb b/plugins/help/templates/help_list.erb
index 2baab3ad76..e2ca2a88ef 100644
--- a/plugins/help/templates/help_list.erb
+++ b/plugins/help/templates/help_list.erb
@@ -6,5 +6,5 @@
 <% end %>
 <% end %>
 <%= paginator.page_footer %>
-<%= t('help.web_help_tip') %>
+<%= t('help.pages_tip') %>
 <%= footer %>
\ No newline at end of file
diff --git a/plugins/ictime/helpers.rb b/plugins/ictime/helpers.rb
index 2a3db0558e..9d8323721e 100644
--- a/plugins/ictime/helpers.rb
+++ b/plugins/ictime/helpers.rb
@@ -46,7 +46,8 @@ def self.convert_to_ictime(t)
       end
     end
     
-    def self.substitute_ic_names(format, time)
+    def self.substitute_ic_names(original_format, time)
+      format = "#{original_format}"
       month_names = Global.read_config("ictime", "month_names") 
       day_names = Global.read_config("ictime", "day_names")
                       
diff --git a/plugins/idle/help/en/manage_roster.md b/plugins/idle/help/en/manage_roster.md
index a81ed3066b..0c5e7fbc17 100644
--- a/plugins/idle/help/en/manage_roster.md
+++ b/plugins/idle/help/en/manage_roster.md
@@ -11,7 +11,7 @@ Players with the necessary permissions can add and remove people from the roster
 `roster/add <name>=<contact>` - Adds someone to the roster.  Contact is optional.
 `roster/remove <name>` - Removes someone from the roster.
 `roster/notes <name>=<summary>` - Adds a short summary of the character.
-`roster/played <yes/no>` - Indicates if the character was previously played.
+`roster/played <name>=<yes/no>` - Indicates if the character was previously played.
 
 ## Restricted Characters
 
diff --git a/plugins/jobs/commands/handle_job_cmd.rb b/plugins/jobs/commands/handle_job_cmd.rb
index df8ca0e42b..ddbb2c4c52 100644
--- a/plugins/jobs/commands/handle_job_cmd.rb
+++ b/plugins/jobs/commands/handle_job_cmd.rb
@@ -27,10 +27,7 @@ def handle
               client.emit_failure t('jobs.cannot_handle_jobs')
               return
             end
-            job.update(assigned_to: target)
-            job.update(status: "OPEN")
-            notification = t('jobs.job_assigned', :number => job.id, :title => job.title, :assigner => enactor_name, :assignee => target.name)
-            Jobs.notify(job, notification, enactor)
+            Jobs.assign(job, target, enactor)
           end
         end
       end
diff --git a/plugins/jobs/commands/job_search_cmd.rb b/plugins/jobs/commands/job_search_cmd.rb
index d31cd30ee5..5650b4b129 100644
--- a/plugins/jobs/commands/job_search_cmd.rb
+++ b/plugins/jobs/commands/job_search_cmd.rb
@@ -23,11 +23,11 @@ def check_category
   
       def handle
         if (self.category == "title")
-          jobs = Job.all.select { |j| j.title =~ /#{self.value}/i }.sort_by { |j| j.id }
+          jobs = Job.all.select { |j| Jobs.can_access_category?(enactor, j.category) && (j.title =~ /#{self.value}/i) }
         elsif (self.category == "submitter")
           result = ClassTargetFinder.find(self.value, Character, enactor)
           if (result.found?)
-            jobs = Job.find(author_id: result.target.id).sort_by(:number)
+            jobs = Job.find(author_id: result.target.id).select { |j| Jobs.can_access_category?(enactor, j.category)}
           else
             client.emit_failure t('db.object_not_found')
             return
@@ -38,6 +38,7 @@ def handle
           return
         end
         
+        jobs = jobs.sort_by { |j| j.created_at }
         paginator = Paginator.paginate(jobs, cmd.page, 20)        
         template = JobsListTemplate.new(enactor, paginator)
         if (paginator.out_of_bounds?)
diff --git a/plugins/jobs/commands/jobs_new_cmd.rb b/plugins/jobs/commands/jobs_new_cmd.rb
index cb7456efe5..319be34de3 100644
--- a/plugins/jobs/commands/jobs_new_cmd.rb
+++ b/plugins/jobs/commands/jobs_new_cmd.rb
@@ -15,7 +15,7 @@ def handle
           return
         end
         
-        unread = unread.sort_by { |j| j.id }
+        unread = unread.sort_by { |j| j.created_at }
         job = unread[0]
         template = JobTemplate.new(enactor, job)            
         client.emit template.render
diff --git a/plugins/jobs/commands/list_requests_cmd.rb b/plugins/jobs/commands/list_requests_cmd.rb
index 71cf0af40b..ed0e2a6d4f 100644
--- a/plugins/jobs/commands/list_requests_cmd.rb
+++ b/plugins/jobs/commands/list_requests_cmd.rb
@@ -8,7 +8,7 @@ def handle
           enactor.jobs.to_a : 
           Jobs.open_requests(enactor)
 
-        requests = requests.sort_by { |r| r.id }
+        requests = requests.sort_by { |r| r.created_at }
         paginator = Paginator.paginate(requests, cmd.page, 20)
         if (paginator.out_of_bounds?)
           template = BorderedDisplayTemplate.new t('pages.not_that_many_pages')
diff --git a/plugins/jobs/helpers.rb b/plugins/jobs/helpers.rb
index 8eb4c68e2a..207c884a36 100644
--- a/plugins/jobs/helpers.rb
+++ b/plugins/jobs/helpers.rb
@@ -2,6 +2,7 @@ module AresMUSH
   module Jobs    
       
     def self.can_access_jobs?(actor)
+      return false if !actor
       actor.has_permission?("access_jobs")
     end
     
@@ -56,18 +57,17 @@ def self.filtered_jobs(char, filter = nil)
       end
       case filter
       when "ALL"
-        jobs = Job.all.to_a
+        jobs = Job.all.select { |j| Jobs.can_access_category?(char, j.category) }
       when "ACTIVE", nil
-        jobs = Job.all.select { |j| j.is_open? || j.is_unread?(char) }
+        jobs = Job.all.select { |j| Jobs.can_access_category?(char, j.category) && (j.is_open? || j.is_unread?(char)) }
       when "MINE"
         jobs = char.assigned_jobs.select { |j| j.is_open? }
       else
-        jobs = Job.find(category: char.jobs_filter.upcase).select { |j| j.is_open? }
+        jobs = Job.find(category: char.jobs_filter.upcase).select { |j| Jobs.can_access_category?(char, j.category) && j.is_open? }
       end
 
       jobs = jobs || []
-      jobs = jobs.select { |j| Jobs.can_access_category?(char, j.category) }
-      jobs.sort_by { |j| j.id }
+      jobs.sort_by { |j| j.created_at }
     end
     
     def self.with_a_job(char, client, number, &block)
@@ -77,10 +77,12 @@ def self.with_a_job(char, client, number, &block)
         return
       end
       
-      if (!Jobs.can_access_category?(char, job.category))
-        client.emit_failure t('jobs.cant_access_category')
+      error = Jobs.check_job_access(char, job)
+      if (error)
+        client.emit_failure error
         return
       end
+      
       yield job
     end
     
@@ -108,6 +110,26 @@ def self.comment(job, author, message, admin_only)
       end
     end
     
+    def self.can_access_job?(enactor, job)
+      !Jobs.check_job_access(enactor, job)
+    end
+    
+    def self.check_job_access(enactor, job, allow_author = false)
+      if (allow_author)
+        return nil if enactor == job.author
+      end
+      return t('dispatcher.not_allowed') if !Jobs.can_access_jobs?(enactor)
+      return t('jobs.cant_access_category') if !Jobs.can_access_category?(enactor, job.category)
+      return nil
+    end
+          
+    def self.assign(job, assignee, enactor)
+      job.update(assigned_to: assignee)
+      job.update(status: "OPEN")
+      notification = t('jobs.job_assigned', :number => job.id, :title => job.title, :assigner => enactor.name, :assignee => assignee.name)
+      Jobs.notify(job, notification, enactor)
+    end
+    
     def self.mark_read(job, char)      
       job.readers.add char
     end
@@ -135,7 +157,7 @@ def self.notify(job, message, author, notify_submitter = true)
     end
     
     def self.reboot_required_notice
-      File.exist?('/var/run/reboot-required')
+      File.exist?('/var/run/reboot-required') ? t('jobs.reboot_required') : nil
     end
   end
 end
\ No newline at end of file
diff --git a/plugins/jobs/jobs.rb b/plugins/jobs/jobs.rb
index 70e610cea2..d370fa0358 100644
--- a/plugins/jobs/jobs.rb
+++ b/plugins/jobs/jobs.rb
@@ -14,77 +14,77 @@ def self.shortcuts
     end
  
     def self.get_cmd_handler(client, cmd, enactor)
-       case cmd.root
-       when "job"
-         case cmd.switch
-         when "all"
-           return ListJobsCmd
-         when "backup"
-           return JobsBackupCmd
-         when "cat"
-           return ChangeCategoryCmd
-         when "catchup"
-           return JobsCatchupCmd
-         when "discuss", "respond"
-           return JobCommentCmd
-         when "close"
-           return CloseJobCmd
-         when "confirmpurge"
-           return PurgeJobsConfirmCmd
-         when "create"
-           return CreateJobCmd
-         when "delete"
-           return DeleteJobCmd
-         when "deletereply"
-           return JobDeleteReplyCmd
-         when "handle", "assign"
-           return HandleJobCmd
-         when "filter"
-           return JobsFilterCmd
-         when "mail"
-           return JobMailCmd
-         when "new"
-           return JobsNewCmd
-         when "purge"
-           return PurgeJobsCmd
-         when "search"
-           return JobSearchCmd
-         when "status"
-           return JobStatusCmd
-         when "title"
-           return ChangeTitleCmd
-         when "unread"
-           return JobUnreadCmd
-         when nil
-           if (cmd.args)
-             return ViewJobCmd
-           else
-             return ListJobsCmd
-           end
-         end
+      case cmd.root
+      when "job"
+        case cmd.switch
+        when "all"
+          return ListJobsCmd
+        when "backup"
+          return JobsBackupCmd
+        when "cat"
+          return ChangeCategoryCmd
+        when "catchup"
+          return JobsCatchupCmd
+        when "discuss", "respond"
+          return JobCommentCmd
+        when "close"
+          return CloseJobCmd
+        when "confirmpurge"
+          return PurgeJobsConfirmCmd
+        when "create"
+          return CreateJobCmd
+        when "delete"
+          return DeleteJobCmd
+        when "deletereply"
+          return JobDeleteReplyCmd
+        when "handle", "assign"
+          return HandleJobCmd
+        when "filter"
+          return JobsFilterCmd
+        when "mail"
+          return JobMailCmd
+        when "new"
+          return JobsNewCmd
+        when "purge"
+          return PurgeJobsCmd
+        when "search"
+          return JobSearchCmd
+        when "status"
+          return JobStatusCmd
+        when "title"
+          return ChangeTitleCmd
+        when "unread"
+          return JobUnreadCmd
+        when nil
+          if (cmd.args)
+            return ViewJobCmd
+          else
+            return ListJobsCmd
+          end
+        end
          
-       when "request"
-         case cmd.switch
-         when "respond"
-           return RequestCommentCmd
-         when "all"
-           return ListRequestsCmd
-         when "create"
-           return CreateRequestCmd
-         when "mail"
-           return RequestMailCmd
-         when nil
-           if (!cmd.args)
-             return ListRequestsCmd
-           elsif (cmd.args =~ /\=/)
-             return CreateRequestCmd
-           else
-             return ViewRequestCmd
-           end
-         end
-       end
+      when "request"
+        case cmd.switch
+        when "respond"
+          return RequestCommentCmd
+        when "all"
+          return ListRequestsCmd
+        when "create"
+          return CreateRequestCmd
+        when "mail"
+          return RequestMailCmd
+        when nil
+          if (!cmd.args)
+            return ListRequestsCmd
+          elsif (cmd.args =~ /\=/)
+            return CreateRequestCmd
+          else
+            return ViewRequestCmd
+          end
+        end
+      end
        
-       nil
+      nil
     end
 
     def self.get_event_handler(event_name) 
@@ -101,6 +101,12 @@ def self.get_web_request_handler(request)
         return JobReplyRequestHandler
       when "jobClose"
         return JobCloseRequestHandler
+      when "jobAssign"
+        return JobAssignRequestHandler
+      when "jobChangeStatus"
+        return JobChangeStatusRequestHandler
+      when "searchJobs"
+        return SearchJobsRequestHandler
       end
       nil
     end
diff --git a/plugins/jobs/public/jobs_char.rb b/plugins/jobs/public/jobs_char.rb
index 1174ae6691..20671d740b 100644
--- a/plugins/jobs/public/jobs_char.rb
+++ b/plugins/jobs/public/jobs_char.rb
@@ -18,7 +18,7 @@ def assigned_jobs
     
     def unread_jobs
       return [] if !Jobs.can_access_jobs?(self)
-      Job.all.select { |j| j.is_unread?(self) }
+      Job.all.select { |j| !Jobs.check_job_access(self, j) && j.is_unread?(self) }
     end
     
     def unread_requests
diff --git a/plugins/jobs/web/job_assign_request_handler.rb b/plugins/jobs/web/job_assign_request_handler.rb
new file mode 100644
index 0000000000..4f405bfd33
--- /dev/null
+++ b/plugins/jobs/web/job_assign_request_handler.rb
@@ -0,0 +1,37 @@
+module AresMUSH
+  module Jobs
+    class JobAssignRequestHandler
+      def handle(request)
+        enactor = request.enactor
+        job = Job[request.args[:id]]
+        assignee = Character[request.args[:assignee_id]]
+
+        error = Website.check_login(request)
+        return error if error
+
+        if (!job)
+          return { error: t('webportal.not_found') }
+        end
+
+        if (!assignee)
+          return { error: t('webportal.not_found') }
+        end
+
+        error = Jobs.check_job_access(enactor, job)
+        if (error)
+          return { error: error }
+        end
+        
+        error = Jobs.check_job_access(assignee, job)
+        if (error)
+          return { error: t('jobs.cannot_handle_jobs') }
+        end
+        
+        Jobs.assign(job, assignee, enactor)
+
+        {
+        }
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/plugins/jobs/web/job_close_request_handler.rb b/plugins/jobs/web/job_close_request_handler.rb
index a639dd5cd7..dda677d333 100644
--- a/plugins/jobs/web/job_close_request_handler.rb
+++ b/plugins/jobs/web/job_close_request_handler.rb
@@ -12,10 +12,10 @@ def handle(request)
           return { error: t('webportal.not_found') }
         end
         
-        if (job.author != enactor)
-          if (!enactor.is_admin?)
-            return { error: t('dispatcher.not_allowed') }
-          end
+        # Authors can close their own jobs.
+        error = Jobs.check_job_access(enactor, job, true)
+        if (error)
+          return { error: error }
         end
         
         Jobs.close_job(enactor, job)
diff --git a/plugins/jobs/web/job_reply_request_handler.rb b/plugins/jobs/web/job_reply_request_handler.rb
index b42c18f258..78b3e8cfbc 100644
--- a/plugins/jobs/web/job_reply_request_handler.rb
+++ b/plugins/jobs/web/job_reply_request_handler.rb
@@ -14,10 +14,10 @@ def handle(request)
           return { error: t('webportal.not_found') }
         end
                 
-        if (job.author != enactor)
-          if (!enactor.is_admin?)
-            return { error: t('dispatcher.not_allowed') }
-          end
+        # Authors can reply to their own job.
+        error = Jobs.check_job_access(enactor, job, true)
+        if (error)
+          return { error: error }
         end
         
         reply = Website.format_input_for_mush(reply)
diff --git a/plugins/jobs/web/job_request_handler.rb b/plugins/jobs/web/job_request_handler.rb
index 83dd319104..b7e0b43e44 100644
--- a/plugins/jobs/web/job_request_handler.rb
+++ b/plugins/jobs/web/job_request_handler.rb
@@ -12,21 +12,19 @@ def handle(request)
           return { error: t('webportal.not_found') }
         end
         
-        job_admin = Jobs.can_access_jobs?(enactor)
+        is_job_admin = Jobs.can_access_jobs?(enactor)
         
-        if (job.author != enactor)
-          
-          if (!job_admin)
-            return { error: t('dispatcher.not_allowed') }
-          end
-        
-          if (!Jobs.can_access_category?(enactor, job.category))
-            return { error: t('jobs.cant_access_category') }
-          end
+        # Authors can access their own job.
+        error = Jobs.check_job_access(enactor, job, true)
+        if (error)
+          return { error: error }
         end
         
         Jobs.mark_read(job, enactor)
         
+        system_char = Game.master.system_character
+        master_admin = Game.master.master_admin
+        job_admin = Character.all.select { |c| Jobs.can_access_job?(c, job) && c != system_char && c != master_admin }
         
         {
           id: job.id,
@@ -36,11 +34,16 @@ def handle(request)
           status: job.status,
           created: job.created_date_str(enactor),
           is_open: job.is_open?,
-          job_admin: job_admin,
+          is_job_admin: is_job_admin,
           is_approval_job: job.author && !job.author.is_approved? && (job.author.approval_job == job),
           author: { name: job.author_name, id: job.author ? job.author.id : nil, icon: Website.icon_for_char(job.author) },
-          assigned_to: job.assigned_to ? job.assigned_to.name : "--",
+          assigned_to: job.assigned_to ? { name: job.assigned_to.name, icon: Website.icon_for_char(job.assigned_to) } : nil,
           description: Website.format_markdown_for_html(job.description),
+          status_values: Jobs.status_vals,
+          job_admin: job_admin.map { |c|  { 
+            id: c.id, 
+            name: c.name 
+            }},
           replies: Jobs.visible_replies(enactor, job).map { |r| {
             author: { name: r.author_name, icon: Website.icon_for_char(r.author) },
             message: Website.format_markdown_for_html(r.message),
diff --git a/plugins/jobs/web/job_status_request_handler.rb b/plugins/jobs/web/job_status_request_handler.rb
new file mode 100644
index 0000000000..1eec57515d
--- /dev/null
+++ b/plugins/jobs/web/job_status_request_handler.rb
@@ -0,0 +1,32 @@
+module AresMUSH
+  module Jobs
+    class JobChangeStatusRequestHandler
+      def handle(request)
+        enactor = request.enactor
+        job = Job[request.args[:id]]
+      	status = (request.args[:status] || "").upcase
+
+        error = Website.check_login(request)
+        return error if error
+
+        if (!job)
+          return { error: t('webportal.not_found') }
+        end
+
+        error = Jobs.check_job_access(enactor, job)
+        if (error)
+          return { error: error }
+        end
+
+        if (!Jobs.status_vals.include?(status))
+          return { error: t('jobs.invalid_status', :statuses => Jobs.status_vals.join(", ")) }
+        end
+
+        Jobs.change_job_status(enactor, job, status)
+
+        {
+        }
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/plugins/jobs/web/jobs_request_handler.rb b/plugins/jobs/web/jobs_request_handler.rb
index 988d2c1797..612abbccac 100644
--- a/plugins/jobs/web/jobs_request_handler.rb
+++ b/plugins/jobs/web/jobs_request_handler.rb
@@ -10,13 +10,13 @@ def handle(request)
         
         job_admin = Jobs.can_access_jobs?(enactor)
         if (job_admin)
-          jobs = Jobs.filtered_jobs(enactor, "ACTIVE").sort_by { |j| j.id }.reverse
+          jobs = Jobs.filtered_jobs(enactor, "ACTIVE").sort_by { |j| j.created_at }.reverse
         else
-          jobs = Jobs.open_requests(enactor).sort_by { |j| j.id }.reverse
+          jobs = Jobs.open_requests(enactor).sort_by { |j| j.created_at }.reverse
         end
         
         { 
-          jobs: jobs.map { |j| {
+          jobs: jobs.reverse.map { |j| {
             id: j.id,
             title: j.title,
             unread: j.is_unread?(enactor),
diff --git a/plugins/jobs/web/search_jobs_request_handler.rb b/plugins/jobs/web/search_jobs_request_handler.rb
new file mode 100644
index 0000000000..a9146802a4
--- /dev/null
+++ b/plugins/jobs/web/search_jobs_request_handler.rb
@@ -0,0 +1,47 @@
+module AresMUSH
+  module Jobs
+    class SearchJobsRequestHandler
+      def handle(request)
+        searchText = (request.args[:searchText] || "").strip
+        searchSubmitter = (request.args[:searchSubmitter] || "").strip
+        searchTitle = (request.args[:searchTitle] || "").strip
+        enactor = request.enactor
+        
+        error = Website.check_login(request)
+        return error if error
+        
+        job_admin = Jobs.can_access_jobs?(enactor)
+        if (job_admin)
+          jobs = Jobs.filtered_jobs(enactor, "ALL")
+        else
+          jobs = Jobs.open_requests(enactor)
+        end
+        
+        if (!searchTitle.blank?)
+          jobs = jobs.select { |j| j.title =~ /\b#{searchTitle}\b/i }
+        end
+
+        if (!searchText.blank?)
+          jobs = jobs.select { |j| "#{j.description} #{Jobs.visible_replies(enactor, j).map { |r| r.message }.join(' ')}" =~ /\b#{searchText}\b/i }
+        end
+        
+        if (!searchSubmitter.blank?)
+          jobs = jobs.select { |j| j.author && (j.author.name.upcase == searchSubmitter.upcase) }
+        end
+                
+        
+        jobs.sort_by { |j| j.created_at }.reverse.map { |j| {
+            id: j.id,
+            title: j.title,
+            unread: j.is_unread?(enactor),
+            created: j.created_date_str(enactor),
+            category: j.category,
+            status: j.status,
+            author: j.author_name,
+            assigned_to: j.assigned_to ? j.assigned_to.name : "--"
+          }}
+        
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/plugins/login/locales/locale_en.yml b/plugins/login/locales/locale_en.yml
index 1105db5070..4e7c20aee8 100644
--- a/plugins/login/locales/locale_en.yml
+++ b/plugins/login/locales/locale_en.yml
@@ -17,7 +17,7 @@ en:
        recaptcha_failed: "Please prove you're human first."
        no_guest_webportal: "Guests do not have a web portal account.  You can still use the 'Play' screen to play with the web client as a guest."
        web_registration_disabled: "Web registration is disabled.  Please create a character in the game."
-       char_reserved: "Character %{name} created.  Temporary password is %{password}."
+       char_reserved: "Character %{name} created.  Temporary password is %{password}"
        invalid_email_format:  "That is not a valid email format."
        password_changed: "You change your password."
        password_reset: "%{name}'s password has been reset to %{password}"
diff --git a/plugins/login/public/login_char.rb b/plugins/login/public/login_char.rb
index 9897853128..36387766de 100644
--- a/plugins/login/public/login_char.rb
+++ b/plugins/login/public/login_char.rb
@@ -41,7 +41,11 @@ def self.check_name(name)
     end
     
     def is_valid_api_token?(token)
-      return self.login_api_token == token && self.login_api_token_expiry > Time.now
+      return self.login_api_token == token && !self.login_token_expired?
+    end
+    
+    def login_token_expired?
+      !self.login_api_token_expiry || (self.login_api_token_expiry < Time.now)
     end
     
     def set_login_token
diff --git a/plugins/login/web/login_request_handler.rb b/plugins/login/web/login_request_handler.rb
index 9ef273c907..e625b5a9dd 100644
--- a/plugins/login/web/login_request_handler.rb
+++ b/plugins/login/web/login_request_handler.rb
@@ -14,7 +14,11 @@ def handle(request)
         elsif (char.is_statue?)
           return { error: t('dispatcher.you_are_statue') }
         end
-        char.set_login_token
+        
+        if (char.login_token_expired?)
+          char.set_login_token
+        end
+        
         {
           token: char.login_api_token,
           name: char.name,
diff --git a/plugins/mail/commands/manage/mail_archive_cmd.rb b/plugins/mail/commands/manage/mail_archive_cmd.rb
index 422b9671a1..e7b49a75f8 100644
--- a/plugins/mail/commands/manage/mail_archive_cmd.rb
+++ b/plugins/mail/commands/manage/mail_archive_cmd.rb
@@ -15,11 +15,7 @@ def required_args
       
       def handle
         Mail.with_a_delivery(client, enactor, self.num) do |delivery|
-          tags = delivery.tags
-          tags << Mail.archive_tag
-          tags.delete(Mail.inbox_tag)
-          tags.uniq!
-          delivery.update(tags: tags)
+          Mail.archive_delivery(delivery)
           client.emit_success t('mail.message_archived')
         end
       end
diff --git a/plugins/mail/helpers.rb b/plugins/mail/helpers.rb
index 5dce9a46d9..8c3ae86b14 100644
--- a/plugins/mail/helpers.rb
+++ b/plugins/mail/helpers.rb
@@ -34,6 +34,14 @@ def self.filtered_mail(char, filter = Mail.inbox_tag)
       messages.sort_by { |m| m.created_at }
     end
     
+    def self.archive_delivery(delivery)
+      tags = delivery.tags
+      tags << Mail.archive_tag
+      tags.delete(Mail.inbox_tag)
+      tags.uniq!
+      delivery.update(tags: tags)
+    end
+    
     def self.with_a_delivery(client, enactor, num, &block)
       list = Mail.filtered_mail(enactor, enactor.mail_filter)      
       Mail.with_a_delivery_from_a_list client, num, list, &block
diff --git a/plugins/mail/mail.rb b/plugins/mail/mail.rb
index c71d1f0356..8e8a08b0a1 100644
--- a/plugins/mail/mail.rb
+++ b/plugins/mail/mail.rb
@@ -96,6 +96,10 @@ def self.get_web_request_handler(request)
         return MailMessageRequestHandler
       when "sendMail"
         return MailSendRequestHandler
+      when "archiveMail"
+        return MailArchiveRequestHandler
+      when "deleteMail"
+        return MailDeleteRequestHandler
       end
       nil
     end
diff --git a/plugins/mail/web/mail_archive_request_handler.rb b/plugins/mail/web/mail_archive_request_handler.rb
new file mode 100644
index 0000000000..66d63b55db
--- /dev/null
+++ b/plugins/mail/web/mail_archive_request_handler.rb
@@ -0,0 +1,27 @@
+module AresMUSH
+  module Mail
+    class MailArchiveRequestHandler
+      def handle(request)
+        enactor = request.enactor
+        message = MailMessage[request.args[:id]]
+        
+        error = Website.check_login(request)
+        return error if error
+
+        if (!message)
+          return { error: t('webportal.missing_required_fields') }
+        end
+        
+        
+        if (message.character != enactor)
+          return { error: t('dispatcher.not_allowed') }
+        end
+        
+        Mail.archive_delivery(message)
+        
+       {
+       }
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/plugins/mail/web/mail_delete_request_handler.rb b/plugins/mail/web/mail_delete_request_handler.rb
new file mode 100644
index 0000000000..71a2998285
--- /dev/null
+++ b/plugins/mail/web/mail_delete_request_handler.rb
@@ -0,0 +1,27 @@
+module AresMUSH
+  module Mail
+    class MailDeleteRequestHandler
+      def handle(request)
+        enactor = request.enactor
+        message = MailMessage[request.args[:id]]
+        
+        error = Website.check_login(request)
+        return error if error
+
+        if (!message)
+          return { error: t('webportal.missing_required_fields') }
+        end
+        
+        
+        if (message.character != enactor)
+          return { error: t('dispatcher.not_allowed') }
+        end
+        
+        message.delete
+        
+       {
+       }
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/plugins/mail/web/mail_message_request_handler.rb b/plugins/mail/web/mail_message_request_handler.rb
index 7818460b5a..9474d01a30 100644
--- a/plugins/mail/web/mail_message_request_handler.rb
+++ b/plugins/mail/web/mail_message_request_handler.rb
@@ -12,6 +12,10 @@ def handle(request)
           return { error: t('webportal.missing_required_fields') }
         end
         
+        if (message.character != enactor)
+          return { error: t('dispatcher.not_allowed') }
+        end
+        
         message.mark_read
         
        {
diff --git a/plugins/profile/locales/locale_en.yml b/plugins/profile/locales/locale_en.yml
index 9ca2f387bf..c7d2634890 100644
--- a/plugins/profile/locales/locale_en.yml
+++ b/plugins/profile/locales/locale_en.yml
@@ -55,4 +55,6 @@ en:
         char_is_npc: "This character is a NPC."
         char_is_admin: "This character is a game administrator."
         char_is_playerbit: "This character is a player bit."
-        char_not_approved: "This character is not yet approved."
\ No newline at end of file
+        char_not_approved: "This character is not yet approved."
+        
+        extra_profile_info: "Also see %xchooks <name>%xn, %xcsheet <name>%xn and %xcrelationships <name>%xn."
\ No newline at end of file
diff --git a/plugins/profile/profile.rb b/plugins/profile/profile.rb
index d3353bf1d7..84cd216202 100644
--- a/plugins/profile/profile.rb
+++ b/plugins/profile/profile.rb
@@ -56,6 +56,8 @@ def self.get_web_request_handler(request)
         return ProfileSaveRequestHandler
       when "profileSource"
         return ProfileSourceRequestHandler
+      when "searchChars"
+        return SearchCharsRequestHandler
       end
       nil
     end
diff --git a/plugins/profile/public/profile_char.rb b/plugins/profile/public/profile_char.rb
index 373a78a9be..cb316fb719 100644
--- a/plugins/profile/public/profile_char.rb
+++ b/plugins/profile/public/profile_char.rb
@@ -35,26 +35,6 @@ def set_profile(new_profile, enactor)
       self.update(profile_last_edited: Time.now)
       ProfileVersion.create(character: self, text: build_profile_version, author: enactor)
     end
-        
-    def search_blob
-      "#{self.name} #{build_profile_version} #{self.profile_tags.join(' ')}"
-    end
-    
-    def searchable?
-      is_approved?
-    end
-    
-    def search_name
-      self.name
-    end
-    
-    def search_id
-      self.name
-    end
-    
-    def search_summary
-      nil
-    end
   end
   
 end
\ No newline at end of file
diff --git a/plugins/profile/templates/profile.erb b/plugins/profile/templates/profile.erb
index b64e7fcd66..c7b0b8efa6 100644
--- a/plugins/profile/templates/profile.erb
+++ b/plugins/profile/templates/profile.erb
@@ -29,6 +29,6 @@
 <%= divider %>
 %xh<%= left( t('profile.handle'), 12 ) %>%xn @<%= handle_name %> - <%= handle_profile %>
 <% end %>
-<%= line_with_text t('profile.hooks_title') %>
-<%= hooks %> 
+<%= divider %>
+<%= t('profile.extra_profile_info') %>
 <%= footer %>
\ No newline at end of file
diff --git a/plugins/profile/templates/profile_template.rb b/plugins/profile/templates/profile_template.rb
index d0128c7963..2610bfdf91 100644
--- a/plugins/profile/templates/profile_template.rb
+++ b/plugins/profile/templates/profile_template.rb
@@ -15,7 +15,7 @@ def approval_status
       end
       
       def basic_demographics
-        Demographics.basic_demographics.sort
+        Demographics.visible_demographics(@char, @enactor).sort
       end
       
       def demographic(d)
@@ -67,7 +67,8 @@ def played_by
       end
       
       def hooks        
-        @char.rp_hooks
+        formatter = MarkdownFormatter.new
+        formatter.to_mush @char.rp_hooks
       end
       
       def last_on
diff --git a/plugins/profile/web/character_request_handler.rb b/plugins/profile/web/character_request_handler.rb
index 036b441e85..3448d71b5f 100644
--- a/plugins/profile/web/character_request_handler.rb
+++ b/plugins/profile/web/character_request_handler.rb
@@ -24,7 +24,7 @@ def handle(request)
         all_fields['age'] = char.age
 
 
-        demographics = Demographics.basic_demographics.sort.each.map { |d| 
+        demographics = Demographics.visible_demographics(char, enactor).sort.each.map { |d| 
             {
               name: d.titleize,
               key: d.titleize,
diff --git a/plugins/profile/web/search_chars_request_handler.rb b/plugins/profile/web/search_chars_request_handler.rb
new file mode 100644
index 0000000000..ed2d6fe494
--- /dev/null
+++ b/plugins/profile/web/search_chars_request_handler.rb
@@ -0,0 +1,41 @@
+module AresMUSH
+  module Profile
+    class SearchCharsRequestHandler
+      def handle(request)
+
+        searchGroups = request.args[:searchGroups] || {}
+        searchDemographics = request.args[:searchDemographics] || {}
+        searchTag = (request.args[:searchTag] || "").strip
+                
+        chars = Chargen.approved_chars
+        
+        searchGroups.each do |group, search|
+          next if search.blank?
+          search = (search || "").strip
+
+          if (group == "rank" && Ranks.is_enabled?)
+            chars = chars.select { |c| c.rank && (c.rank.upcase == search.upcase )}
+          else
+            chars = chars.select { |c| c.group(group) =~ /\b#{search}\b/i }
+          end
+        end
+        
+        searchDemographics.each do |demo, search|
+          next if search.blank?
+          search = (search || "").strip
+          chars = chars.select { |c| c.demographic(demo) =~ /\b#{search}\b/i }
+        end
+        
+        if (!searchTag.blank?)
+          chars = chars.select { |p| p.profile_tags.include?(searchTag.downcase) }
+        end
+
+        chars.sort_by { |c| c.name }.map { |c| {
+                          id: c.id,
+                          name: c.name,
+                          icon: Website.icon_for_char(c)
+                        }}
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/plugins/rooms/public/area.rb b/plugins/rooms/public/area.rb
index 9e2984a11c..ae404e3269 100644
--- a/plugins/rooms/public/area.rb
+++ b/plugins/rooms/public/area.rb
@@ -24,28 +24,6 @@ def sorted_children
     def save_upcase
       self.name_upcase = self.name ? self.name.upcase : nil
     end
-    
-    def search_blob
-      rooms = self.rooms.map { |r| "#{r.name} #{r.description}"}.join(" ")
-      parent_name = self.parent ? self.parent.name : ''
-      "#{self.name} #{self.description} #{parent_name} #{rooms}"
-    end
-    
-    def searchable?
-      true
-    end
-    
-    def search_name
-      self.name
-    end
-    
-    def search_id
-      self.id
-    end
-    
-    def search_summary
-      self.description
-    end
   end
 end
 
diff --git a/plugins/rooms/public/exit.rb b/plugins/rooms/public/exit.rb
index 39cefc2e11..722655b45a 100644
--- a/plugins/rooms/public/exit.rb
+++ b/plugins/rooms/public/exit.rb
@@ -6,5 +6,10 @@ def allow_passage?(char)
       return false if (self.lock_keys == Rooms.interior_lock)
       return (self.lock_keys.empty? || char.has_any_role?(self.lock_keys))
     end
+    
+    def owned_by?(char)
+      self.source && self.source.room_owner == char.id
+    end
+    
   end
 end
\ No newline at end of file
diff --git a/plugins/scenes/helpers.rb b/plugins/scenes/helpers.rb
index 3783ede999..bb2a40eee3 100644
--- a/plugins/scenes/helpers.rb
+++ b/plugins/scenes/helpers.rb
@@ -4,7 +4,7 @@ module Scenes
     def self.new_scene_activity(scene, data = nil)
       web_msg = "#{scene.id}|#{data}"
       Global.client_monitor.notify_web_clients(:new_scene_activity, web_msg) do |char|
-        Scenes.is_watching?(scene, char)
+        Scenes.can_read_scene?(char, scene)
       end
     end
     
diff --git a/plugins/scenes/public/scene.rb b/plugins/scenes/public/scene.rb
index dec7e0203d..92a1979c9a 100644
--- a/plugins/scenes/public/scene.rb
+++ b/plugins/scenes/public/scene.rb
@@ -130,28 +130,5 @@ def unlike(char)
     def likes
       self.likers.count
     end
-
-    def search_name
-      self.title.blank? ? "Untitled Scene #{self.id}" : self.title
-    end
-    
-    def search_id
-      self.id
-    end
-    
-    def searchable?
-      self.shared
-    end
-    
-    def search_blob
-      people = self.participants.map { |p| p.name }.join(" ")
-      log = self.scene_log ? self.scene_log.log : ''
-      plot = self.plot ? self.plot.title : ''
-      "#{self.search_name} #{self.summary} #{plot} #{people} #{tags.join(' ')} #{log}"
-    end
-    
-    def search_summary
-      self.summary
-    end
   end
 end
diff --git a/plugins/scenes/scenes.rb b/plugins/scenes/scenes.rb
index 066f5d244f..21b6f0f5bc 100644
--- a/plugins/scenes/scenes.rb
+++ b/plugins/scenes/scenes.rb
@@ -173,6 +173,8 @@ def self.get_web_request_handler(request)
         return GetSceneTypesRequestHandler
       when "sceneLocations"
         return GetSceneLocationsHandler
+      when "searchScenes"
+        return SearchScenesRequestHandler
       when "unwatchScene"
         return UnwatchSceneRequestHandler
       end
diff --git a/plugins/scenes/web/search_scenes_handler.rb b/plugins/scenes/web/search_scenes_handler.rb
new file mode 100644
index 0000000000..9f9c310fb8
--- /dev/null
+++ b/plugins/scenes/web/search_scenes_handler.rb
@@ -0,0 +1,49 @@
+module AresMUSH
+  module Scenes
+    class SearchScenesRequestHandler
+      def handle(request)
+
+        searchLog = (request.args[:searchLog] || "").strip
+        searchParticipant = (request.args[:searchParticipant] || "").strip
+        searchTitle = (request.args[:searchTitle] || "").strip
+        searchTag = (request.args[:searchTag] || "").strip
+        searchDate = (request.args[:searchDate] || "").strip
+        
+        scenes = Scene.shared_scenes
+        
+        if (!searchTitle.blank?)
+          scenes = scenes.select { |s| s.title =~ /\b#{searchTitle}\b/i }
+        end
+                
+        if (!searchLog.blank?)
+          scenes = scenes.select { |s| "#{s.summary} #{s.scene_log.log}" =~ /\b#{searchLog}\b/i }
+        end
+        
+        if (!searchDate.blank?)
+          scenes = scenes.select { |s| s.icdate.start_with?(searchDate) }
+        end
+        
+        if (!searchParticipant.blank?)
+          names = searchParticipant.upcase.split(" ")
+          scenes = scenes.select { |s| (names & s.participants.map { |p| p.name.upcase }).count == names.count }
+        end
+        
+        if (!searchTag.blank?)
+          scenes = scenes.select { |s| s.tags.include?(searchTag.downcase) }
+        end
+                
+        scenes.sort_by { |s| s.date_shared || s.created_at }.reverse.map { |s| {
+                          id: s.id,
+                          title: s.title,
+                          summary: s.summary,
+                          location: s.location,
+                          icdate: s.icdate,
+                          participants: s.participants.to_a.sort_by { |p| p.name }.map { |p| { name: p.name, id: p.id, icon: Website.icon_for_char(p) }},
+                          scene_type: s.scene_type ? s.scene_type.titlecase : 'Unknown',
+                          likes: s.likes
+        
+                        }}
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/plugins/website/helpers/general.rb b/plugins/website/helpers/general.rb
index 8f6bbf3eac..9f9f67f2aa 100644
--- a/plugins/website/helpers/general.rb
+++ b/plugins/website/helpers/general.rb
@@ -36,7 +36,7 @@ def self.rebuild_css
       scss_path = File.join(engine_styles_path, 'ares.scss')
       css_path = File.join(AresMUSH.website_styles_path, 'ares.css')
       load_paths = [ engine_styles_path, AresMUSH.website_styles_path ]
-      css = Sass::Engine.for_file(scss_path, { load_paths: load_paths }).render
+      css = SassC::Engine.new(File.read(scss_path), { load_paths: load_paths }).render
       File.open(css_path, "wb") {|f| f.write(css) }
     end
     
diff --git a/plugins/website/public/wiki_page.rb b/plugins/website/public/wiki_page.rb
index 955d81940c..657a748ea1 100644
--- a/plugins/website/public/wiki_page.rb
+++ b/plugins/website/public/wiki_page.rb
@@ -91,26 +91,5 @@ def get_lock_info(enactor)
         return nil
       end
     end
-    
-    def search_name
-      self.heading
-    end
-    
-    def search_id
-      WikiPage.sanitize_page_name(self.name)
-    end
-    
-    def searchable?
-      true
-    end
-    
-    def search_blob
-      text = self.current_version ? self.current_version.text : ''
-      "#{self.search_name} #{text} #{tags.join(' ')}"
-    end
-    
-    def search_summary
-      nil
-    end
   end
 end
\ No newline at end of file
diff --git a/plugins/website/web/get_sidebar_info_handler.rb b/plugins/website/web/get_sidebar_info_handler.rb
index 0784789143..6a434c1c07 100644
--- a/plugins/website/web/get_sidebar_info_handler.rb
+++ b/plugins/website/web/get_sidebar_info_handler.rb
@@ -6,17 +6,17 @@ def handle(request)
         
         error = Website.check_login(request, true)
         return error if error
-                
-        wiki_nav = []
-        nav_list = Global.read_config('website', 'wiki_nav') || [ "Home" ]
-        nav_list.each do |page_name|
-          page = WikiPage.find_one_by_name(WikiPage.sanitize_page_name(page_name))
-          if (page)
-            wiki_nav << { url: page.name, heading: page.heading }
+        
+        if (enactor)
+          if (Jobs.can_access_jobs?(enactor))
+            job_activity = enactor.unread_jobs.count
           else
-            Global.logger.warn "Can't find wiki page #{page_name}."
+            job_activity = enactor.unread_requests.count
           end
+        else
+          job_activity = nil
         end
+        
         {
           timestamp: Time.now.getutc,
           game: GetGameInfoRequestHandler.new.handle(request),
@@ -27,8 +27,10 @@ def handle(request)
           unread_mail: enactor ? enactor.unread_mail.count : nil,
           recent_changes: Website.get_recent_changes(true, 10),
           left_sidebar: Global.read_config('website', 'left_sidebar'),
+          top_navbar: Global.read_config('website', 'top_navbar'),
           registration_required: Global.read_config("website", "portal_requires_registration"),
-          wiki_nav: wiki_nav
+          job_activity: job_activity,
+          jobs_admin: Jobs.can_access_jobs?(enactor)
         }
       end
     end
diff --git a/plugins/website/web/search_wiki_request_handler.rb b/plugins/website/web/search_wiki_request_handler.rb
new file mode 100644
index 0000000000..28b4a4c2c4
--- /dev/null
+++ b/plugins/website/web/search_wiki_request_handler.rb
@@ -0,0 +1,27 @@
+module AresMUSH
+  module Website
+    class SearchWikiRequestHandler
+      def handle(request)
+
+        searchText = (request.args[:searchText] || "").strip
+        searchTag = (request.args[:searchTag] || "").strip
+        
+        pages = WikiPage.all
+        
+        if (!searchText.blank?)
+          pages = pages.select { |p| p.text =~ /\b#{searchText}\b/i }
+        end
+        
+        if (!searchTag.blank?)
+          pages = pages.select { |p| p.tags.include?(searchTag.downcase) }
+        end
+
+        pages.sort_by { |p| p.heading }
+        .map{ |p| {
+          heading: p.heading,
+          id: p.name
+        }}
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/plugins/website/web/site_search_request_handler.rb b/plugins/website/web/site_search_request_handler.rb
deleted file mode 100644
index 7e5f20c6fe..0000000000
--- a/plugins/website/web/site_search_request_handler.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-module AresMUSH
-  module Website
-    class SiteSearchRequestHandler
-      def handle(request)
-        search = request.args[:search]
-        
-        search_result =  Website.search(search)
-        
-        results = search_result.sort_by { |data| data[:name] }
-
-        {
-          term: search,
-          results: results
-        }
-        
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/plugins/website/website.rb b/plugins/website/website.rb
index 8fb2f8e5cd..34de9c3a75 100644
--- a/plugins/website/website.rb
+++ b/plugins/website/website.rb
@@ -54,6 +54,8 @@ def self.get_web_request_handler(request)
         return EditWikiPageRequestHandler
       when "editWikiCancel"
         return CancelEditWikiPageRequestHandler
+      when "searchWiki"
+        return SearchWikiRequestHandler
       when "wikiPage"
         return GetWikiPageRequestHandler
       when "wikiTagList"
@@ -118,8 +120,6 @@ def self.get_web_request_handler(request)
         return MarkdownPreviewRequestHandler
       when "recentChanges"
         return GetRecentChangesRequestHandler
-      when "searchSite"
-        return SiteSearchRequestHandler
       when "sidebarInfo"
         return GetSidebarInfoRequestHandler
       when "shutdown"
diff --git a/version.txt b/version.txt
index 48b9990e0b..00d0c14da8 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.31
+0.32