Improved menu system, added sub categories