Added password change
Cleaned up templates