Restructured layout