clean up views and controllers to work with new routes