More CSS tweaks and some cleanup