Layout and color tweaks