Removed extra span tag
Extended user profile view and edit

Profile edits are now saved correctly to the database, along with any
password changes.