added stuff to navbar
Merge branch 'live'
made CaptchaWrapper