David updated layouts and menus