Done menu update : Fixed MenuController null exception, changed menu from map to list.