Refactoring and Popups Drafts