Refactored dialog boxes as features