ux(): app navigation improvements, changes to plugin.json for apps, merged pages with includes section, #4434