updated views and controller