Changed colours and fixed details