Bug fix: overlapping variable usage in scope
Bug fix: menu name stored as menu instead of name
Removal of unnecessary data