Tweaked layout and colour a tiny bit