a few changes to views and controllers