Restructure default layout