Tidy up of menus and accreditation screens