CSS tweaks and a bug fix