* Support filter toolbar and filtering
* Minor changes
* Code cleanup
Merge remote-tracking branch 'origin/master'