user profile and edit

merged edit and change pass. and small fixes