Update views, controllers

Fully functional app