Changes to make controller and view easily overridable