Created login page
Fix merge issues