Tech Debt: Refactored password-confirmation into a proper component

Also a few odds and ends of clean up and refactoring