selector fix
bug fix
cosmetic changes
all the good stuff happens on master

Merge branch 'master' into awesomely-bad-login-page