Updated CSS and Layout