Merge "Revert "Tweak UI for main filtering entry point""