Update colours and remove inline labels as design don't desire we have
them