more refactor ... clean up planner pages