Refactoring and adding VC for modal filter view