code-cleanup and other CSS tweaks