Adjusted layout and spacing