afr changes
Fixing menu, adding new table information and adding 2-dim array