DAR-2629 | Prepare for re-calc overflow menu