Fixed the user login
Partly fixed the layout