more fix for the map file loading
Merge remote-tracking branch 'origin' into feature/73
skeleton of sub-menus