Filter view changes
Toolbar view refactored