CSS tweaks and cleanup