Add 'Save Profile' button, refactor, add to comments