restructured the layout