Changed menu to use index instead of string. Fixed remove item problem
and other display index issues.