Improve UI for survey listing
Merge branch 'master' into stable