Survey Tweaks + gray-box class added