longsurveyfront button and bug fixes
merge conflict resolved