Additional style tweaks and refinement