Restructuring the layouts