Update SW form
Merge branch 'SW-edits' into staging