Adding some more color and layout tweaks