Menu cleanup
Punchlist #1: Email -> Username
Punch List #1 - Sign In/Sign Up form