DRYed up many of the views and controllers