Fix subgoal display issues
Fix subgoal display issues