Restuctured default layout