Still tweaking login and registration (almost done)