Add unit recalculator
Plus more robust if less elegant callbacks when toggling an option