CSS tweaks and bug fixes