fix for adding/removing staff features, refactoring to common partials