login stuff

username now optional
user can now login with email address
moved login button to left of cart button on navbar, and added border