CSS tweak
Merge branch 'develop'
CSS tweak
login/register tweaks
Merge branch 'develop'