Upgraded planner
Merge remote-tracking branch 'origin/menu_change'