Added beforeFilters and edited views