Fixed bug with filters not appearing in the correct place
Improved filter UI, fixes bug #6