Changes to goal controller and views