User/Admin Controller Update

some things fixed and added