[RFR] Put filters into a well

...and add classes to ease styling by entity

![image](https://cloud.githubusercontent.com/assets/99944/5508228/eabc8a1a-87aa-11e4-9d55-c8f13b10c50e.png)