Merge branch 'add-core-and-more'
Merge branch 'navigation-menus'
wip front-end builder page