Some more small tweaks to style