Basic html for login and register page
Merge and fixes