Added views and removed view functionality from the controllers