modified views and controllers