Rework layout of survey