Fixed menu system, broke battle system