Updated Controllers and Views for new DB