Revert "Revert "work on new UI for tag-based folder policy""

This reverts commit 6f9d9e6ff923fb8dda80208d40473b94872368f9.