Cleaned up the UI on ViewGoal