Style and layout refinements