Various changes to the feature - primarily to the views.