Add a better view schedule generation, Refactor actions in servces