Pull in more website fixes

* Fix search bar on webkit

* Rename Settings to Account
Merge branch 'master' into deploy