Revised filter count layout
Navigation UI updates