updated layout and spacing