Fix UI for Survey Editor & Create Survey pages

Still needs more styling… but the structure is fixed from the merge
which lost a lot of the CSS.