Update views and controllers