Refactoring of popup with daily tasks