Some tweaks to style
Some more tweaks to style