legend and filters
[finish #72698102]
styles
Merge branch 'developer/davidsingal' into dev

* developer/davidsingal:
  styles
  [finish #72698102]
  legend and filters