views and controller changes