CSS tweaks & cleanup