Updated CSS and general layout