Minor changes to layouts