minor CSS tweaks, some code clean-up