Reorder questions and remove sub-headings as they add no value