Concatenated main page and login page
Fixed small design bugs