CSS tweaks and todo mods