Updated Controllers and Views for user functionality