Big patch fix for subpage shortcode with menu, still need cleanup.