Cleaned up new goal page