Several changes for colours and basic layout.