reorganized default layout