Modified layouts and css
Fixed merge conflicts