Changes in views and controller