UX changes for Survey forms