Refactored menu init
Added blank line
Refactored "with Data"
Added space
Merge branch 'ref/build-popup' into develop