Performance improvement: prevented shapes from redrawing twice on add or remove (was happening due to implicit reorder).
Performance improvement: prevented shapes from redrawing twice on add or
remove (was happening due to implicit reorder).

cse-bristol/energy-efficiency-planner,cse-bristol/energy-efficiency-planner,cse-bristol/energy-efficiency-planner