Color and text tweaks from Susan/Rashina