styling the homepage and the layout file
fixing merge conflicts because marco didn't check with Isaac