Added edit user functionality

Plus other minor updates
Updated user model functionality