CSS tweaks and code shuffling