Refactored ActionHandler and Workflow, added pop up box