CSS and layout added
fix merge conflicts