views and controllers fixed