Updated Controllers and Views