reorganized the layout