changes to views and controllers