Survey settings editor

Also includes:
- changes from an earlier pull request to handle navigation on login -- best to merge that first and then revisit this. 
- whitespace fixes in a couple files