updated views and controllers