Tweaks of ordering and color.