Refactoring of new task popup