Further tweaks, CSS, etc