Updated structure for default layout