More CSS and layout changes