Cleanup and menu change
Fixup heritage section
Style partners, fix heritage order