Improved filter view layout

Closes #1335