added colours and fixed padding