some changes in layouts