CSS and HTML layout tweaks