Fix some style issues that were causing vanishing elements
* Fix bug with filtering event