Updated user controller and added some other basic stuff