Wording some pages
Merge branch 'master', remote-tracking branch 'origin/master'
Remove search box again!!! Don't DELETE MY CODE!