CSS and other small tweaks