remove charity post type, add links to main nav