Refined layout and style