Reorganizing the basic layout