Survey Tweaks + gray-box class added
Merge branch 'dev'