fixing up some mistakes in namings of layouts