Small fixes and CSS tweaks