More css tweaks/cleanup