updated copy to questions and remove expandable panel
Fix indentation
Update integration tests to work with new form layout