Fixing display error for separate 'log-in/sign-up'
Merge pull request #643 from andrewhayward/tweaks

Fixing display error for separate 'log-in/sign-up'
several small fixes