Start re-adding reset
Add missing reset pieces
Add double password check
Merge pull request #289 from LocalData/reset-fix

Re-add reset UI