Fixed Scaling issues for front Long Surveys
fixed merge conflicts