Enabled the basket to be made inactive in the controller
Combinded first name and last name for the user model