Apply fix for calculation button popover
Add crop surface for dynamic demand calculation