Edited home page.
Resolved merge conflict with the log-out button.
Css and html stuff.
Merged.