Improved a bit layouting transition
Merge branch 'betterFiltering'