merging dev
merging dev
event filter styling