fixed layout
Merge branch 'master' of https://github.com/projecttouch/projecttouch
Allow switching off of filters
Merge branch 'master' of github.com:projecttouch/projecttouch
Add ability to turn off filters