Fix several changes in views and controllers