Refractoring all of the views to DRY things up