Add with_ constraints
Add activity filters
Expand chart to full width of window