General fixes to colours and design