Tweaks and CSS code tidy