structured the layout more