Sieve Filters (Interface first look)
Code refactoring
Small fixes
Small fixes