Updated CSS and layout