Added sumbmenu support - code refactor
Merge with menu props