Some more visual refinement