Profile updating
Edit user controller, clean up.
Updating and refactoring
Reorg/refactor
More cleanup