some changes to layouts