Refactor the filter bar into smaller modules