Solved merge conflicts with header
Restyled the login and signin pages
Restyled the edit user page
Fixed merge conflicts in header
Fixed merge conflicts in custom.css file