diff --git a/resources/js/components/navigation/View.vue b/resources/js/components/navigation/View.vue
index 3e6c68032c6..810f322fe21 100644
--- a/resources/js/components/navigation/View.vue
+++ b/resources/js/components/navigation/View.vue
@@ -9,7 +9,7 @@
                 <h1 class="flex-1" v-text="title" />
 
                 <dropdown-list class="mr-1">
-                    <dropdown-item :text="__('Configure Navigation')" :redirect="editUrl" />
+                    <slot name="twirldown" />
                 </dropdown-list>
 
                 <a @click="$refs.tree.cancel" class="text-2xs text-blue mr-2 underline" v-if="isDirty" v-text="__('Discard changes')" />
@@ -29,11 +29,11 @@
                             :class="{ 'flex items-center pr-2': hasCollections }"
                             @click="addLink"
                         >
-                            {{ __('Add Link') }}
+                            {{ __('Add Nav Item') }}
                             <svg-icon name="chevron-down-xs" class="w-2 ml-2" v-if="hasCollections" />
                         </button>
                     </template>
-                    <dropdown-item :text="__('Link to URL')" @click="linkPage()" />
+                    <dropdown-item :text="__('Add Nav Item')" @click="linkPage()" />
                     <dropdown-item :text="__('Link to Entry')" @click="linkEntries()" />
                 </dropdown-list>
 
@@ -51,13 +51,14 @@
             :has-collection="false"
             :pages-url="pagesUrl"
             :submit-url="submitUrl"
+            :submit-parameters="{ data: submissionData }"
             :max-depth="maxDepth"
             :expects-root="expectsRoot"
             :site="site"
             :preferences-prefix="preferencesPrefix"
             @edit-page="editPage"
             @changed="changed = true; targetParent = null;"
-            @saved="changed = false"
+            @saved="treeSaved"
             @canceled="changed = false"
         >
             <template #empty>
@@ -102,6 +103,10 @@
             </template>
 
             <template #branch-options="{ branch, removeBranch, orphanChildren, vm, depth }">
+                <dropdown-item
+                    v-if="isEntryBranch(branch)"
+                    :text="__('Edit Entry')"
+                    :redirect="branch.edit_url" />
                 <dropdown-item
                     v-if="depth < maxDepth"
                     :text="__('Add child link to URL')"
@@ -127,14 +132,27 @@
 
         <page-editor
             v-if="editingPage"
-            :initial-title="editingPage.page.title"
-            :initial-url="editingPage.page.url"
+            :site="site"
+            :id="editingPage.page.id"
+            :entry="editingPage.page.entry"
+            :editEntryUrl="editingPage.page.entry ? editingPage.page.edit_url : null"
+            :publish-info="publishInfo[editingPage.page.id]"
+            :blueprint="blueprint"
+            :handle="handle"
+            @publish-info-updated="updatePublishInfo"
+            @localized-fields-updated="updateLocalizedFields"
             @closed="closePageEditor"
             @submitted="updatePage"
         />
 
         <page-editor
             v-if="creatingPage"
+            creating
+            :site="site"
+            :blueprint="blueprint"
+            :handle="handle"
+            @publish-info-updated="updatePendingCreatedPagePublishInfo"
+            @localized-fields-updated="updatePendingCreatedPageLocalizedFields"
             @closed="closePageCreator"
             @submitted="pageCreated"
         />
@@ -156,6 +174,7 @@ import PageEditor from '../structures/PageEditor.vue';
 import PageSelector from '../structures/PageSelector.vue';
 import RemovePageConfirmation from './RemovePageConfirmation.vue';
 import SiteSelector from '../SiteSelector.vue';
+import uniqid from 'uniqid';
 
 export default {
 
@@ -178,7 +197,8 @@ export default {
         maxDepth: { type: Number, default: Infinity, },
         expectsRoot: { type: Boolean, required: true },
         site: { type: String, required: true },
-        sites: { type: Array, required: true }
+        sites: { type: Array, required: true },
+        blueprint: { type: Object, required: true }
     },
 
     data() {
@@ -192,6 +212,7 @@ export default {
             pageBeingDeleted: null,
             pageDeletionConfirmCallback: null,
             preferencesPrefix: `navs.${this.handle}`,
+            publishInfo: {},
         }
     },
 
@@ -215,6 +236,12 @@ export default {
 
         hasCollections() {
             return this.collections.length > 0;
+        },
+
+        submissionData() {
+            return _.mapObject(this.publishInfo, value => {
+                return _.pick(value, ['entry', 'values', 'localizedFields', 'new']);
+            });
         }
 
     },
@@ -248,11 +275,26 @@ export default {
         },
 
         entriesSelected(pages) {
+            pages = pages.map(page => ({
+                ...page,
+                id: uniqid(),
+                entry: page.id,
+                entry_title: page.title,
+                title: null
+            }));
+
+            pages.forEach(page => {
+                this.publishInfo = {...this.publishInfo, [page.id]: {
+                    entry: page.entry,
+                    new: true,
+                }};
+            });
+
             this.$refs.tree.addPages(pages, this.targetParent);
         },
 
         isEntryBranch(branch) {
-            return !!branch.id;
+            return !!branch.entry;
         },
 
         isLinkBranch(branch) {
@@ -263,19 +305,16 @@ export default {
             return !this.isEntryBranch(branch) && !this.isLinkBranch(branch);
         },
 
-        editPage(page, vm, store, $event) {
-            if (page.id) {
-                const url = page.edit_url;
-                $event.metaKey ? window.open(url) : window.location = url;
-            } else {
-                this.editingPage = { page, vm, store };
-            }
+        editPage(page, vm, store) {
+            this.editingPage = { page, vm, store };
         },
 
-        updatePage(page) {
-            this.editingPage.page.url = page.url;
-            this.editingPage.page.title = page.title;
+        updatePage(values) {
+            this.editingPage.page.url = values.url;
+            this.editingPage.page.title = values.title;
+            this.editingPage.page.values = values;
             this.$refs.tree.pageUpdated(this.editingPage.store);
+            this.publishInfo[this.editingPage.page.id].values = values;
 
             this.editingPage = false;
         },
@@ -285,20 +324,31 @@ export default {
         },
 
         openPageCreator() {
-            this.creatingPage = true;
+            this.creatingPage = { info: null };
         },
 
         closePageCreator() {
             this.creatingPage = false;
         },
 
-        pageCreated(page) {
-            this.closePageCreator();
-            this.$refs.tree.addPages([{
-                title: page.title,
-                url: page.url,
+        pageCreated(values) {
+            const page = {
+                id: uniqid(),
+                title: values.title,
+                url: values.url,
                 children: []
-            }], this.targetParent);
+            };
+
+            this.$set(this.publishInfo, page.id, {
+                ...this.creatingPage.info,
+                values,
+                entry: null,
+                new: true,
+            });
+
+            this.$refs.tree.addPages([page], this.targetParent);
+
+            this.closePageCreator();
         },
 
         deleteTreeBranch(branch, removeFromUi, orphanChildren) {
@@ -314,6 +364,43 @@ export default {
 
         siteSelected(site) {
             window.location = site.url;
+        },
+
+        updatePublishInfo(info) {
+            this.publishInfo = { ...this.publishInfo, [this.editingPage.page.id]: info };
+        },
+
+        updatePendingCreatedPagePublishInfo(info) {
+            this.creatingPage.info = info;
+        },
+
+        updateLocalizedFields(fields) {
+            this.publishInfo[this.editingPage.page.id].localizedFields = fields;
+        },
+
+        updatePendingCreatedPageLocalizedFields(fields) {
+            this.creatingPage.info.localizedFields = fields;
+        },
+
+        treeSaved(response) {
+            this.changed = false;
+
+            this.replaceGeneratedIds(response.data.generatedIds);
+        },
+
+        replaceGeneratedIds(ids) {
+            for (let [oldId, newId] of Object.entries(ids)) {
+                // Replace the ID in the publishInfo so if the tree is saved again, its
+                // data will be submitted using the real ID, and now the temp JS one.
+                this.$set(this.publishInfo, newId, { ...this.publishInfo[oldId], new: false });
+                this.$delete(this.publishInfo, oldId);
+
+                // Replace the ID in the branch within the tree.
+                // Same as above, but in the tree itself.
+                let branch = this.$refs.tree.getNodeByBranchId(oldId);
+                branch.id = newId;
+                this.$refs.tree.pageUpdated(branch._vm.store);
+            }
         }
 
     }
diff --git a/resources/js/components/publish/Field.vue b/resources/js/components/publish/Field.vue
index 3faea781018..35f5b95fdff 100644
--- a/resources/js/components/publish/Field.vue
+++ b/resources/js/components/publish/Field.vue
@@ -8,7 +8,12 @@
     <div slot-scope="{ meta, value, loading: loadingMeta }" :class="classes">
         <div class="field-inner">
             <label class="publish-field-label" :class="{'font-bold': config.bold}" :for="fieldId">
-                <span :class="{'font-mono bg-grey-20 py-px px-sm text-xs': showHandle, 'cursor-pointer': canToggleLabel }" v-text="labelText" />
+                <span :class="{
+                    'font-mono bg-grey-20 py-px px-sm text-xs': showHandle,
+                    'cursor-pointer': canToggleLabel,
+                    'text-grey-60': syncable && isSynced
+                    }"
+                v-text="labelText" />
                 <i class="required ml-sm" v-if="config.required">*</i>
                 <avatar v-if="isLocked" :user="lockingUser" class="w-4 rounded-full -mt-px ml-1 mr-1" v-tooltip="lockingUser.name" />
                 <span v-if="isReadOnly && !isSection" class="text-grey-50 font-normal text-2xs mx-sm">
@@ -22,7 +27,7 @@
                     class="outline-none"
                     @click="$emit('desynced')"
                 >
-                    <svg-icon name="hyperlink" class="h-4 ml-sm w-4 text-grey-60"
+                    <svg-icon name="hyperlink" class="h-4 w-4 ml-.5 mt-sm text-grey-60"
                         v-tooltip.top="__('messages.field_synced_with_origin')" />
                 </button>
 
@@ -32,7 +37,7 @@
                     class="outline-none"
                     @click="$emit('synced')"
                 >
-                    <svg-icon name="hyperlink-broken" class="h-4 ml-sm w-4 text-grey-60"
+                    <svg-icon name="hyperlink-broken" class="h-4 w-4 ml-.5 mt-sm text-grey-60"
                         v-tooltip.top="__('messages.field_desynced_from_origin')" />
                 </button>
             </label>
diff --git a/resources/js/components/publish/Fields.vue b/resources/js/components/publish/Fields.vue
index 78b00ee09e1..3175e12a381 100644
--- a/resources/js/components/publish/Fields.vue
+++ b/resources/js/components/publish/Fields.vue
@@ -11,7 +11,7 @@
             :meta="meta[field.handle]"
             :errors="errors[field.handle]"
             :read-only="readOnly"
-            :syncable="syncable"
+            :syncable="isSyncableField(field)"
             :can-toggle-label="canToggleLabels"
             :name-prefix="namePrefix"
             @input="$emit('updated', field.handle, $event)"
@@ -45,6 +45,7 @@ export default {
         },
         readOnly: Boolean,
         syncable: Boolean,
+        syncableFields: Array,
         canToggleLabels: Boolean,
         namePrefix: String,
     },
@@ -67,6 +68,18 @@ export default {
             return this.state.errors;
         }
 
+    },
+
+    methods: {
+
+        isSyncableField(field) {
+            if (! this.syncable) return false;
+
+            if (! this.syncableFields) return true;
+
+            return this.syncableFields.includes(field.handle);
+        }
+
     }
 
 }
diff --git a/resources/js/components/structures/Branch.vue b/resources/js/components/structures/Branch.vue
index 0db95eac218..b15b5b216ad 100644
--- a/resources/js/components/structures/Branch.vue
+++ b/resources/js/components/structures/Branch.vue
@@ -9,11 +9,11 @@
                 <a
                     @click="$emit('edit', $event)"
                     :class="{ 'text-sm font-medium': isTopLevel }"
-                    v-text="page.title || page.url" />
+                    v-text="title" />
 
                 <button
                     v-if="hasChildren"
-                    class="p-1 text-grey-60 hover:text-grey-70 transition duration-100 outline-none"
+                    class="p-1 text-grey-60 hover:text-grey-70 transition duration-100 outline-none flex"
                     :class="{ '-rotate-90': !isOpen }"
                     @click="$emit('toggle-open')"
                 >
@@ -94,6 +94,10 @@ export default {
 
         isText() {
             return this.page.title && !this.page.url;
+        },
+
+        title() {
+            return this.page.title || this.page.entry_title || this.page.url;
         }
 
     },
diff --git a/resources/js/components/structures/PageEditor.vue b/resources/js/components/structures/PageEditor.vue
index e00c013739b..78b89c75bdc 100644
--- a/resources/js/components/structures/PageEditor.vue
+++ b/resources/js/components/structures/PageEditor.vue
@@ -1,37 +1,63 @@
 <template>
 
-    <stack narrow name="page-tree-linker" @closed="$emit('closed')">
+    <stack narrow name="page-tree-linker" :before-close="shouldClose" @closed="$emit('closed')">
         <div slot-scope="{ close }" class="bg-white h-full flex flex-col">
 
             <div class="bg-grey-20 px-3 py-1 border-b border-grey-30 text-lg font-medium flex items-center justify-between">
-                {{ __('Link') }}
+                {{ headerText }}
                 <button
                     type="button"
                     class="btn-close"
-                    @click="close"
+                    @click="confirmClose(close)"
                     v-html="'&times'" />
             </div>
 
-            <div class="flex-1 overflow-auto">
+            <div v-if="loading" class="flex-1 overflow-auto relative">
+                <div class="absolute inset-0 z-10 bg-white bg-opacity-75 flex items-center justify-center text-center">
+                    <loading-graphic />
+                </div>
+            </div>
 
-                <publish-fields-container>
-                    <form-group
-                        :display="__('Title')"
-                        handle="title"
-                        v-model="title"
-                        :instructions="__('Link display text. Leave blank to use the URL.')"
-                    />
-                    <form-group
-                        :display="__('URL')"
-                        handle="url"
-                        v-model="url"
-                        :instructions="__('Enter any internal or external URL. Leave blank for a text-only item.')"
-                    />
+            <div v-else class="flex-1 overflow-auto">
 
-                </publish-fields-container>
+                <publish-container
+                    ref="container"
+                    :name="publishContainer"
+                    :blueprint="adjustedBlueprint"
+                    :values="values"
+                    :meta="meta"
+                    :errors="errors"
+                    :localized-fields="localizedFields"
+                    @updated="values = $event"
+                >
+                    <div slot-scope="{ container, setFieldMeta }">
+                        <div v-if="validating" class="absolute inset-0 z-10 bg-white bg-opacity-75 flex items-center justify-center">
+                            <loading-graphic text="" />
+                        </div>
+
+                        <publish-fields
+                            :fields="fields"
+                            :syncable="type == 'entry'"
+                            :syncable-fields="syncableFields"
+                            @updated="setFieldValue"
+                            @meta-updated="setFieldMeta"
+                            @synced="syncField"
+                            @desynced="desyncField"
+                            @focus="container.$emit('focus', $event)"
+                            @blur="container.$emit('blur', $event)"
+                        />
+                    </div>
+                </publish-container>
 
                 <div class="p-3">
                     <button @click="submit" class="btn-primary w-full">{{ __('Submit') }}</button>
+
+                    <div class="text-xs mt-2" v-if="type === 'entry'">
+                        <a :href="editEntryUrl" target="_blank" class="flex items-center justify-center text-blue hover:text-blue-dark underline">
+                            <svg-icon name="external-link" class="w-4 h-4 mr-1" />
+                            {{ __('Edit Entry') }}
+                        </a>
+                    </div>
                 </div>
 
             </div>
@@ -45,34 +71,223 @@
 export default {
 
     props: {
-        initialTitle: String,
-        initialUrl: String,
+        id: String,
+        entry: String,
+        site: String,
+        publishInfo: Object,
+        blueprint: Object,
+        handle: String,
+        editEntryUrl: String,
+        creating: Boolean
     },
 
     data() {
         return {
-            title: this.initialTitle,
-            url: this.initialUrl,
+            type: this.entry ? 'entry' : 'url',
+            values: null,
+            meta: null,
+            originValues: null,
+            originMeta: null,
+            localizedFields: null,
+            syncableFields: null,
+            loading: true,
+            error: null,
+            errors: {},
+            validating: false,
+            saveKeyBinding: null,
+            publishContainer: 'tree-page'
+        }
+    },
+
+    computed: {
+        headerText() {
+            return this.entry ? __('Link to Entry') : __('Nav Item');
+        },
+
+        adjustedBlueprint() {
+            function isMissingField(fields, handle) {
+                return ! fields.some(field => field.handle === handle);
+            }
+            function hasField(fields, handle) {
+                return ! isMissingField(fields, handle);
+            }
+
+            // This UI only supports the first section
+            const blueprint = clone(this.blueprint);
+            const fields = blueprint.sections[0].fields;
+
+            if (this.type == 'url' && isMissingField(fields, 'url')) {
+                fields.unshift({
+                    handle: 'url',
+                    type: 'text',
+                    display: __('URL'),
+                    instructions: __('Enter any internal or external URL. Leave blank for a text-only item.'),
+                });
+            }
+
+            // Remove the "url" field if it's been added to the blueprint by the user.
+            // URL fields only make sense for URL type pages. Entries will have their own URLs.
+            if (this.type == 'entry' && hasField(fields, 'url')) {
+                fields.splice(fields.indexOf(fields.find(field => field.handle === 'url')), 1);
+            }
+
+            if (isMissingField(fields, 'title')) {
+                fields.unshift({
+                    handle: 'title',
+                    type: 'text',
+                    display: __('Title'),
+                    instructions: __('Link display text. Leave blank to use the URL.'),
+                });
+            }
+
+            return { ...blueprint, sections: [{ fields }] };
+        },
+
+        fields() {
+            return _.chain(this.adjustedBlueprint.sections)
+                .map(section => section.fields)
+                .flatten(true)
+                .value();
+        }
+    },
+
+    watch: {
+        localizedFields(fields) {
+            if (this.loading) return;
+
+            this.$emit('localized-fields-updated', fields);
         }
     },
 
     methods: {
         submit() {
-            if (!this.title && !this.url) {
-                alert('You need at least a title or URL.');
+            this.validating = true;
+
+            const postUrl = cp_url(`navigation/${this.handle}/pages`);
+
+            this.$axios.post(postUrl, {
+                type: this.type,
+                values: this.values
+            }).then(response => {
+                this.$emit('submitted', this.values);
+            }).catch(e => {
+                this.validating = false;
+                if (e.response && e.response.status === 422) {
+                    const { message, errors } = e.response.data;
+                    this.error = message;
+                    this.errors = errors;
+                    this.$toast.error(message);
+                } else if (e.response) {
+                    this.$toast.error(e.response.data.message);
+                } else {
+                    this.$toast.error(e || 'Something went wrong');
+                }
+            });
+        },
+
+        shouldClose() {
+            if (this.$dirty.has(this.publishContainer)) {
+                if (! confirm(__('Are you sure? Unsaved changes will be lost.'))) {
+                    return false;
+                }
+            }
+
+            return true;
+        },
+
+        confirmClose(close) {
+            if (this.shouldClose()) close();
+        },
+
+        syncField(handle) {
+            if (! confirm('Are you sure? This field\'s value will be replaced by the value in the original entry.'))
                 return;
+
+            this.localizedFields = this.localizedFields.filter(field => field !== handle);
+            this.$refs.container.setFieldValue(handle, this.originValues[handle]);
+
+            // Update the meta for this field. For instance, a relationship field would have its data preloaded into it.
+            // If you sync the field, the preloaded data would be outdated and an ID would show instead of the titles.
+            this.meta[handle] = this.originMeta[handle];
+        },
+
+        desyncField(handle) {
+            if (!this.localizedFields.includes(handle))
+                this.localizedFields.push(handle);
+
+            this.$refs.container.dirty();
+        },
+
+        setFieldValue(handle, value) {
+            this.desyncField(handle);
+
+            this.$refs.container.setFieldValue(handle, value);
+        },
+
+        getPageValues() {
+            const hasPublishInfo = !!this.publishInfo;
+            const hasPublishInfoWithValues = hasPublishInfo && this.publishInfo.hasOwnProperty('values');
+
+            if (hasPublishInfo && hasPublishInfoWithValues) {
+                this.updatePublishInfo(this.publishInfo);
+                this.loading = false;
+                return;
+            }
+
+            const creating = this.creating || (hasPublishInfo && !hasPublishInfoWithValues);
+
+            let url = creating
+                ? cp_url(`navigation/${this.handle}/pages/create`)
+                : cp_url(`navigation/${this.handle}/pages/${this.id}/edit`);
+
+            url += `?site=${this.site}`;
+
+            if (creating && this.type == 'entry') {
+                url += `&entry=${this.entry}`;
             }
 
-            this.$emit('submitted', {
-                title: this.title,
-                url: this.url,
+            this.$axios.get(url).then(response => {
+                this.updatePublishInfo(response.data);
+                this.emitPublishInfoUpdated(hasPublishInfo && this.publishInfo.new);
+                this.loading = false;
+            });
+        },
+
+        updatePublishInfo(info) {
+            this.values = info.values;
+            this.originValues = info.originValues;
+            this.meta = info.meta;
+            this.originMeta = info.originMeta;
+            this.localizedFields = info.localizedFields;
+            this.syncableFields = info.syncableFields;
+        },
+
+        emitPublishInfoUpdated(isNew) {
+            this.$emit('publish-info-updated', {
+                values: this.values,
+                originValues: this.originValues,
+                meta: this.meta,
+                originMeta: this.originMeta,
+                localizedFields: this.localizedFields,
+                syncableFields: this.syncableFields,
+                entry: this.entry,
+                new: isNew
             });
         }
     },
 
     created() {
-        this.$keys.bindGlobal('enter', this.submit)
+        this.saveKeyBinding = this.$keys.bindGlobal(['mod+enter', 'mod+s'], e => {
+            e.preventDefault();
+            this.submit();
+        });
+
+        this.getPageValues();
     },
 
+    destroyed() {
+        this.saveKeyBinding.destroy();
+    }
+
 }
 </script>
diff --git a/resources/js/components/structures/PageTree.vue b/resources/js/components/structures/PageTree.vue
index afcc33d3df4..7c0f05ff8ec 100644
--- a/resources/js/components/structures/PageTree.vue
+++ b/resources/js/components/structures/PageTree.vue
@@ -68,6 +68,7 @@
 
 
 <script>
+import * as th from 'tree-helper';
 import {DraggableTree} from 'vue-draggable-nested-tree/dist/vue-draggable-nested-tree';
 import TreeBranch from './Branch.vue';
 
@@ -97,7 +98,6 @@ export default {
             saving: false,
             pages: [],
             treeData: [],
-            pageIds: [],
             soundDropUrl: this.$config.get('resourceUrl') + '/audio/click.mp3',
         }
     },
@@ -108,10 +108,6 @@ export default {
             return _.findWhere(this.localizations, { active: true });
         },
 
-        exclusions() {
-            return this.hasCollection ? this.pageIds : [];
-        },
-
         preferencesKey() {
             return this.preferencesPrefix ? `${this.preferencesPrefix}.${this.site}.pagetree` : null;
         },
@@ -120,17 +116,6 @@ export default {
 
     watch: {
 
-        pages: {
-            deep: true,
-            handler(pages) {
-                this.pageIds = this.getPageIds(pages);
-            }
-        },
-
-        pageIds(ids) {
-            this.$emit('page-ids-updated', ids);
-        },
-
         site(site) {
             this.getPages();
         }
@@ -161,23 +146,12 @@ export default {
             });
         },
 
-        getPageIds(pages) {
-            let ids = [];
-            pages.forEach(page => {
-                ids.push(page.id);
-                if (page.children.length) {
-                    ids = [...ids, ...this.getPageIds(page.children)];
-                }
-            })
-            return ids;
-        },
-
         treeChanged(node, tree) {
             if (!this.validate()) {
                 this.updateTreeData();
                 return;
             }
-            
+
             this.treeUpdated(tree);
         },
 
@@ -191,23 +165,36 @@ export default {
 
         validate() {
             let isValid = true;
-            
+
             this.traverseTree(this.treeData, (node, { isRoot }) => {
                 if (isRoot && node.children.length) {
                     isValid = false;
                     return false;
-                } 
+                }
             });
 
             return isValid;
         },
 
+        cleanPagesForSubmission(pages) {
+            return _.map(pages, page => ({
+                id: page.id,
+                children: this.cleanPagesForSubmission(page.children)
+            }));
+        },
+
         save() {
             this.saving = true;
-            const payload = { pages: this.pages, site: this.site, expectsRoot: this.expectsRoot, ...this.submitParameters };
 
-            return this.$axios.post(this.submitUrl, payload).then(response => {
-                this.$emit('saved');
+            const payload = {
+                pages: this.cleanPagesForSubmission(this.pages),
+                site: this.site,
+                expectsRoot: this.expectsRoot,
+                ...this.submitParameters
+            };
+
+            return this.$axios.patch(this.submitUrl, payload).then(response => {
+                this.$emit('saved', response);
                 this.$toast.success(__('Saved'));
                 this.initialPages = this.pages;
                 this.saveTreeState();
@@ -234,7 +221,9 @@ export default {
             pages.forEach(selection => {
                 parent.push({
                     id: selection.id,
+                    entry: selection.entry,
                     title: selection.title,
+                    entry_title: selection.entry_title,
                     slug: selection.slug,
                     url: selection.url,
                     edit_url: selection.edit_url,
@@ -292,7 +281,7 @@ export default {
                 nodeDepth = Math.max(nodeDepth, depth);
             });
             const maxDepth = this.maxDepth - nodeDepth;
-            
+
             this.traverseTree(this.treeData, (childNode, { depth, isRoot }) => {
                 if (childNode !== node) {
                     this.$set(childNode, 'droppable', !isRoot && depth <= maxDepth);
@@ -364,11 +353,11 @@ export default {
                 const path = nodePath.join('.');
                 const depth = nodePath.length;
                 const isRoot = this.expectsRoot && depth === 1 && index === 0;
-                
+
                 if (false === callback(node, { path, depth, index, isRoot })) {
                     return false;
                 }
-                
+
                 if (node.children.length) {
                     this.traverseTree(node.children, callback, nodePath);
                 }
@@ -377,6 +366,19 @@ export default {
             });
         },
 
+        getNodeByBranchId(id) {
+            let branch;
+
+            th.breadthFirstSearch(this.treeData, (node) => {
+                if (node.id === id) {
+                    branch = node
+                    return false
+                }
+            });
+
+            return branch;
+        }
+
     }
 }
 </script>
diff --git a/resources/lang/da/messages.php b/resources/lang/da/messages.php
index a9df4dbeb11..05c64d7608c 100644
--- a/resources/lang/da/messages.php
+++ b/resources/lang/da/messages.php
@@ -116,6 +116,7 @@
     'licensing_utility_description' => 'Se og løs licensoplysninger.',
     'max_depth_instructions' => 'Indstil et maksimalt antal niveauer, der muligvis er indlejret. Uden begrænsning hvis denne indstilling er blank.',
     'max_items_instructions' => 'Indstil et maksimalt antal valgbare emner.',
+    'navigation_configure_blueprint_instructions' => 'Vælg mellem eksisterende blueprints, eller opret et nyt.',
     'navigation_configure_collections_instructions' => 'Aktiver link til poster i disse samlinger.',
     'navigation_configure_handle_instructions' => 'Bruges til at henvise til denne navigation på frontend. Det er besværligt at ændre senere.',
     'navigation_configure_intro' => 'Navigationer er lister over flere niveauer af links, der kan bruges til at oprette navbars, sidefødder, sitemaps og andre former for frontend navigation.',
diff --git a/resources/lang/de/messages.php b/resources/lang/de/messages.php
index ceb8e90f307..39150c4813c 100644
--- a/resources/lang/de/messages.php
+++ b/resources/lang/de/messages.php
@@ -118,6 +118,7 @@
     'licensing_utility_description' => 'Lizenzdetails anzeigen und auflösen.',
     'max_depth_instructions' => 'Maximale Anzahl von Ebenen festlegen, in denen Seiten verschachtelt werden dürfen. Für eine unbegrenzte Tiefe leer lassen.',
     'max_items_instructions' => 'Maximale Anzahl auswählbarer Einträge festlegen.',
+    'navigation_configure_blueprint_instructions' => 'Wähle aus vorhandenen Blueprints oder erstelle einen Neuen.',
     'navigation_configure_collections_instructions' => 'Aus diesen Sammlungen können Einträge verknüpft werden.',
     'navigation_configure_handle_instructions' => 'Verweist im Frontend auf diese Navigation. Es ist nicht unproblematisch, dies nachträglich zu ändern.',
     'navigation_configure_intro' => 'Navigationen sind mehrstufige Linklisten, mit denen Navbars, Footers, Sitemaps und andere Formen der Frontend-Navigation erstellt werden können.',
diff --git a/resources/lang/de_CH/messages.php b/resources/lang/de_CH/messages.php
index e7a0c350f14..00cadb21727 100644
--- a/resources/lang/de_CH/messages.php
+++ b/resources/lang/de_CH/messages.php
@@ -118,6 +118,7 @@
     'licensing_utility_description' => 'Lizenzdetails anzeigen und auflösen.',
     'max_depth_instructions' => 'Maximale Anzahl von Ebenen festlegen, in denen Seiten verschachtelt werden dürfen. Für eine unbegrenzte Tiefe leer lassen.',
     'max_items_instructions' => 'Maximale Anzahl auswählbarer Einträge festlegen.',
+    'navigation_configure_blueprint_instructions' => 'Wähle aus vorhandenen Blueprints oder erstelle einen Neuen.',
     'navigation_configure_collections_instructions' => 'Aus diesen Sammlungen können Einträge verknüpft werden.',
     'navigation_configure_handle_instructions' => 'Verweist im Frontend auf diese Navigation. Es ist nicht unproblematisch, dies nachträglich zu ändern.',
     'navigation_configure_intro' => 'Navigationen sind mehrstufige Linklisten, mit denen Navbars, Footers, Sitemaps und andere Formen der Frontend-Navigation erstellt werden können.',
diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index fc0651d5def..676ef1ea3d5 100644
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -119,6 +119,7 @@
     'licensing_utility_description' => 'View and resolve licensing details.',
     'max_depth_instructions' => 'Set a maximum number of levels page may be nested. Leave blank for no limit.',
     'max_items_instructions' => 'Set a maximum number of selectable items.',
+    'navigation_configure_blueprint_instructions' => 'Choose from existing Blueprints or create a new one.',
     'navigation_configure_collections_instructions' => 'Enable linking to entries in these collections.',
     'navigation_configure_handle_instructions' => 'Used to reference this navigation on the frontend. It\'s non-trivial to change later.',
     'navigation_configure_intro' => 'Navigations are multi-level lists of links that can be used to build navbars, footers, sitemaps, and other forms of frontend navigation.',
diff --git a/resources/lang/es/messages.php b/resources/lang/es/messages.php
index 8920fdb6b19..b573b82dcbf 100644
--- a/resources/lang/es/messages.php
+++ b/resources/lang/es/messages.php
@@ -117,6 +117,7 @@
     'licensing_utility_description' => 'Ver y resolver los detalles de la licencia.',
     'max_depth_instructions' => 'Establece el número máximo de niveles en los que una página pueda ser anidada. Déjalo en blanco para que sea ilimitado.',
     'max_items_instructions' => 'Establece un número máximo de elementos seleccionables.',
+    'navigation_configure_blueprint_instructions' => 'Elige entre planos existentes o crea uno nuevo.',
     'navigation_configure_collections_instructions' => 'Habilita el enlace a entradas en estas colecciones.',
     'navigation_configure_handle_instructions' => 'Se usa para hacer referencia a esta navegación en la interfaz. Es complicado cambiarlo más tarde.',
     'navigation_configure_intro' => 'Las navegaciones son listas de enlaces de varios niveles que se pueden utilizar para crear barras de navegación, menús, mapas del sitio y cualquier forma de navegación en el front-end.',
diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php
index e26619808d9..7897a69c2c1 100644
--- a/resources/lang/fr/messages.php
+++ b/resources/lang/fr/messages.php
@@ -118,6 +118,7 @@
     'licensing_utility_description' => 'Affichez et résolvez les détails de la licence.',
     'max_depth_instructions' => 'Définissez le nombre maximum de niveaux sur lesquels une page peut être imbriquée. Laissez vide pour aucune limite.',
     'max_items_instructions' => 'Définissez un nombre maxi d’éléments sélectionnables.',
+    'navigation_configure_blueprint_instructions' => 'Choisissez un Blueprint existant ou créez-en un nouveau.',
     'navigation_configure_collections_instructions' => 'Activer le lien vers les entrées de ces collections.',
     'navigation_configure_handle_instructions' => 'Comment vous allez faire référence à cette navigation sur le frontal. Ne peut pas être facilement changé.',
     'navigation_configure_intro' => 'Les navigations sont des listes multi-niveaux de liens qui peuvent être utilisées pour construire des barres de navigation, des pieds de page, des plans de site et d’autres formes de navigation sur le frontal.',
diff --git a/resources/lang/id/messages.php b/resources/lang/id/messages.php
index b87dfa8531f..24a70c5a98d 100644
--- a/resources/lang/id/messages.php
+++ b/resources/lang/id/messages.php
@@ -115,6 +115,7 @@
     'licensing_utility_description' => 'Lihat dan selesaikan detail lisensi.',
     'max_depth_instructions' => 'Tetapkan jumlah maksimum halaman level yang dapat disarangkan. Biarkan kosong untuk tidak ada batas.',
     'max_items_instructions' => 'Tetapkan jumlah maksimum item yang dapat dipilih.',
+    'navigation_configure_blueprint_instructions' => 'Pilih dari Cetak Biru yang ada atau buat yang baru.',
     'navigation_configure_collections_instructions' => 'Aktifkan penautan ke entri dalam koleksi ini.',
     'navigation_configure_handle_instructions' => 'Digunakan untuk mereferensikan navigasi ini di frontend. Tidak sepele untuk berubah nanti.',
     'navigation_configure_intro' => 'Navigasi adalah daftar tautan multi-level yang dapat digunakan untuk membuat bilah navigasi, footer, peta situs, dan bentuk navigasi frontend lainnya..',
diff --git a/resources/lang/it/messages.php b/resources/lang/it/messages.php
index 5d625508d43..9685bde48a2 100644
--- a/resources/lang/it/messages.php
+++ b/resources/lang/it/messages.php
@@ -115,6 +115,7 @@
     'licensing_utility_description' => 'Visualizza e risolvi i dettagli della licenza.',
     'max_depth_instructions' => 'Imposta il numero massimo di livelli di profondità di una pagina. Lascia vuoto per nessun limite.',
     'max_items_instructions' => 'Imposta il numero massimo di voci selezionabili.',
+    'navigation_configure_blueprint_instructions' => 'Scegli tra i progetti esistenti o creane uno nuovo.',
     'navigation_configure_collections_instructions' => 'Abilita il collegamento alle voci in queste raccolte.',
     'navigation_configure_handle_instructions' => 'Utilizzato come riferimento a questo menu sul frontend. Non è semplice modificarlo successivamente.',
     'navigation_configure_intro' => 'I menu sono elenchi multi-livello di collegamenti che possono essere utilizzati per creare barre di navigazione, footer, sitemap e così via.',
diff --git a/resources/lang/nl/messages.php b/resources/lang/nl/messages.php
index 796b3f98f1c..de7d387a9ea 100644
--- a/resources/lang/nl/messages.php
+++ b/resources/lang/nl/messages.php
@@ -118,6 +118,7 @@
     'licensing_utility_description' => 'Bekijk en los licentiegegevens op.',
     'max_depth_instructions' => 'Stel een maximum aan het aantal pagina\'s dat genest mag worden. Laat leeg voor geen limiet.',
     'max_items_instructions' => 'Stel een maximum aan het aantal items dat geselecteerd mag worden.',
+    'navigation_configure_blueprint_instructions' => 'Kies uit bestaande blueprints of maak een nieuwe aan.',
     'navigation_configure_collections_instructions' => 'Sta toe dat er naar entries in deze collectie gelinkt mogen worden.',
     'navigation_configure_handle_instructions' => 'Wordt gebruikt om aan deze navigatie te refereren aan in de frontend. Het is niet persé eenvoudig om dit nadien te wijzigen.',
     'navigation_configure_intro' => 'Navigaties zijn multi-level lijsten met links die gebruikt kunnen worden om navigatiemenu\'s, footers, sitemaps en andere frontendnavigaties te maken.',
diff --git a/resources/lang/pt/messages.php b/resources/lang/pt/messages.php
index cbbdde5cf86..40fdc7983a4 100644
--- a/resources/lang/pt/messages.php
+++ b/resources/lang/pt/messages.php
@@ -115,6 +115,7 @@
     'licensing_utility_description' => 'Ver e resolver detalhes de licenciamento.',
     'max_depth_instructions' => 'O número máximo de níveis em uma página pode estar encadeado. Deixe em branco sem limite.',
     'max_items_instructions' => 'Defina um número máximo de itens seleccionáveis.',
+    'navigation_configure_blueprint_instructions' => 'Escolha entre os diagramas existentes ou crie um novo.',
     'navigation_configure_collections_instructions' => 'Habilitar a ligação às entradas nestas colecções.',
     'navigation_configure_handle_instructions' => 'Utilizado para fazer referência a esta navegação no frontend. É não trivial mudar mais tarde.',
     'navigation_configure_intro' => 'As navegações são listas de vários níveis de ligações que podem ser usados para construir barras de navegação, rodapés, sitesmaps e outras formas de navegação front-end.',
diff --git a/resources/lang/sl/messages.php b/resources/lang/sl/messages.php
index 4ead103607a..0dff09dd09b 100644
--- a/resources/lang/sl/messages.php
+++ b/resources/lang/sl/messages.php
@@ -115,6 +115,7 @@
     'licensing_utility_description' => 'Oglejte si in razrešite podrobnosti o licenciranju.',
     'max_depth_instructions' => 'Nastavite lahko največje število ravni. Pustite prazno brez omejitev.',
     'max_items_instructions' => 'Nastavite največje število izbirnih elementov.',
+    'navigation_configure_blueprint_instructions' => 'Izberite med obstoječimi načrti ali ustvarite novega.',
     'navigation_configure_collections_instructions' => 'Omogoči povezavo do vnosov v teh zbirkah.',
     'navigation_configure_handle_instructions' => 'Uporablja se za sklicevanje na to navigacijo na čelni strani. Pozneje se spreminjati ni trivialno.',
     'navigation_configure_intro' => 'Navigacije so večstopenjski seznami povezav, ki jih je mogoče uporabiti za izdelavo navbarov, nogic, zemljevidov mest in drugih oblik čelne navigacije.',
diff --git a/resources/lang/zh_TW/messages.php b/resources/lang/zh_TW/messages.php
index 3e6ceb61739..115be394419 100644
--- a/resources/lang/zh_TW/messages.php
+++ b/resources/lang/zh_TW/messages.php
@@ -117,6 +117,7 @@
     'licensing_utility_description' => '檢視並解析授權詳情。',
     'max_depth_instructions' => '設定頁面可嵌套的最大層級數。留空表示無限制。',
     'max_items_instructions' => '設定最大可選項目的數量。',
+    'navigation_configure_blueprint_instructions' => '從現有的藍圖中選擇或建立新藍圖。',
     'navigation_configure_collections_instructions' => '允許連結到這些條目集中的條目。',
     'navigation_configure_handle_instructions' => '用於在前端參照到此導航。設定後將難以更改。',
     'navigation_configure_intro' => '導航列是多層級的連結列表，可用於建構導航列、頁腳連結、網站地圖、以及其他格式的前端導航。',
diff --git a/resources/views/blueprints/index.blade.php b/resources/views/blueprints/index.blade.php
index 9adf1e3f83c..13b13554b52 100644
--- a/resources/views/blueprints/index.blade.php
+++ b/resources/views/blueprints/index.blade.php
@@ -73,6 +73,26 @@
         @endif
     @endforeach
 
+    @foreach (Statamic\Facades\Nav::all() as $nav)
+        @if ($loop->first)
+        <h3 class="little-heading pl-0 mb-1">{{ __('Navigation') }}</h3>
+        <div class="card p-0 mb-2">
+            <table class="data-table">
+        @endif
+                <tr>
+                    <td>
+                        <div class="flex items-center">
+                            <div class="w-4 h-4 mr-2">@cp_svg('hierarchy-files')</div>
+                            <a href="{{ cp_route('navigation.blueprint.edit', $nav->handle()) }}">{{ $nav->title() }}</a>
+                        </div>
+                    </td>
+                </tr>
+        @if ($loop->last)
+            </table>
+        </div>
+        @endif
+    @endforeach
+
     @foreach (Statamic\Facades\GlobalSet::all() as $set)
         @if ($loop->first)
         <h3 class="little-heading pl-0 mb-1">{{ __('Globals') }}</h3>
diff --git a/resources/views/collections/show.blade.php b/resources/views/collections/show.blade.php
index 3899f21a93a..94254c65067 100644
--- a/resources/views/collections/show.blade.php
+++ b/resources/views/collections/show.blade.php
@@ -23,8 +23,8 @@
 
         @if ($collection->hasStructure())
         :structured="{{ Statamic\Support\Str::bool($user->can('reorder', $collection)) }}"
-        structure-pages-url="{{ cp_route('structures.pages.index', 'collection::'.$structure->handle()) }}"
-        structure-submit-url="{{ cp_route('collections.structure.update', $collection->handle()) }}"
+        structure-pages-url="{{ cp_route('collections.tree.index', $structure->handle()) }}"
+        structure-submit-url="{{ cp_route('collections.tree.update', $collection->handle()) }}"
         :structure-max-depth="{{ $structure->maxDepth() ?? 'Infinity' }}"
         :structure-expects-root="{{ Statamic\Support\Str::bool($structure->expectsRoot()) }}"
         @endif
diff --git a/resources/views/navigation/blueprints/edit.blade.php b/resources/views/navigation/blueprints/edit.blade.php
new file mode 100644
index 00000000000..992cabe9abd
--- /dev/null
+++ b/resources/views/navigation/blueprints/edit.blade.php
@@ -0,0 +1,22 @@
+@extends('statamic::layout')
+@section('title', __('Edit Blueprint'))
+
+@section('content')
+
+    @include('statamic::partials.breadcrumb', [
+        'url' => cp_route('navigation.show', $nav->handle()),
+        'title' => $nav->title(),
+    ])
+
+    <blueprint-builder
+        action="{{ cp_route('navigation.blueprint.update', $nav->handle()) }}"
+        :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
+        :use-sections="false"
+    ></blueprint-builder>
+
+    @include('statamic::partials.docs-callout', [
+        'topic' => __('Blueprints'),
+        'url' => Statamic::docsUrl('blueprints')
+    ])
+
+@endsection
diff --git a/resources/views/navigation/show.blade.php b/resources/views/navigation/show.blade.php
index ce92c35005c..e1e7936e332 100644
--- a/resources/views/navigation/show.blade.php
+++ b/resources/views/navigation/show.blade.php
@@ -8,14 +8,24 @@
         title="{{ $nav->title() }}"
         handle="{{ $nav->handle() }}"
         breadcrumb-url="{{ cp_route('navigation.index') }}"
-        pages-url="{{ cp_route('structures.pages.index', $nav->handle()) }}"
-        submit-url="{{ cp_route('structures.pages.store', $nav->handle()) }}"
+        pages-url="{{ cp_route('navigation.tree.index', $nav->handle()) }}"
+        submit-url="{{ cp_route('navigation.tree.update', $nav->handle()) }}"
         edit-url="{{ $nav->editUrl() }}"
         site="{{ $site }}"
         :sites="{{ json_encode($sites) }}"
         :collections="{{ json_encode($collections) }}"
         :max-depth="{{ $nav->maxDepth() ?? 'Infinity' }}"
         :expects-root="{{ $str::bool($expectsRoot) }}"
-    ></navigation-view>
+        :blueprint="{{ json_encode($blueprint) }}"
+    >
+        <template #twirldown>
+            @can('edit', $nav)
+                <dropdown-item :text="__('Edit Navigation')" redirect="{{ $nav->editUrl() }}"></dropdown-item>
+            @endcan
+            @can('configure fields')
+                <dropdown-item :text="__('Edit Blueprint')" redirect="{{ cp_route('navigation.blueprint.edit', $nav->handle()) }}"></dropdown-item>
+            @endcan
+        </template>
+    </navigation-view>
 
 @endsection
diff --git a/routes/cp.php b/routes/cp.php
index d3991505f9a..0da5e2430ce 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -28,19 +28,28 @@
 
     Route::get('select-site/{handle}', 'SelectSiteController@select');
 
-    Route::group(['namespace' => 'Structures'], function () {
+    Route::group(['namespace' => 'Navigation'], function () {
         Route::resource('navigation', 'NavigationController');
-        Route::resource('structures.pages', 'StructurePagesController', ['only' => ['index', 'store']]);
+
+        Route::get('navigation/{navigation}/blueprint', 'NavigationBlueprintController@edit')->name('navigation.blueprint.edit');
+        Route::patch('navigation/{navigation}/blueprint', 'NavigationBlueprintController@update')->name('navigation.blueprint.update');
+        Route::get('navigation/{navigation}/tree', 'NavigationTreeController@index')->name('navigation.tree.index');
+        Route::patch('navigation/{navigation}/tree', 'NavigationTreeController@update')->name('navigation.tree.update');
+        Route::post('navigation/{navigation}/pages', 'NavigationPagesController@update')->name('navigation.pages.update');
+        Route::get('navigation/{navigation}/pages/create', 'NavigationPagesController@create')->name('navigation.pages.create');
+        Route::get('navigation/{navigation}/pages/{edit}/edit', 'NavigationPagesController@edit')->name('navigation.pages.edit');
     });
 
     Route::group(['namespace' => 'Collections'], function () {
         Route::resource('collections', 'CollectionsController');
-        Route::post('collections/{collection}/structure', 'CollectionStructureController@update')->name('collections.structure.update');
         Route::get('collections/{collection}/scaffold', 'ScaffoldCollectionController@index')->name('collections.scaffold');
         Route::post('collections/{collection}/scaffold', 'ScaffoldCollectionController@create')->name('collections.scaffold.create');
         Route::resource('collections.blueprints', 'CollectionBlueprintsController');
         Route::post('collections/{collection}/blueprints/reorder', 'ReorderCollectionBlueprintsController')->name('collections.blueprints.reorder');
 
+        Route::get('collections/{collection}/tree', 'CollectionTreeController@index')->name('collections.tree.index');
+        Route::patch('collections/{collection}/tree', 'CollectionTreeController@update')->name('collections.tree.update');
+
         Route::group(['prefix' => 'collections/{collection}/entries'], function () {
             Route::get('/', 'EntriesController@index')->name('collections.entries.index');
             Route::post('actions', 'EntryActionController@run')->name('collections.entries.actions.run');
diff --git a/src/Events/NavBlueprintFound.php b/src/Events/NavBlueprintFound.php
new file mode 100644
index 00000000000..02d69b55eb0
--- /dev/null
+++ b/src/Events/NavBlueprintFound.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Statamic\Events;
+
+class NavBlueprintFound extends Event
+{
+    public $blueprint;
+    public $nav;
+
+    public function __construct($blueprint, $nav = null)
+    {
+        $this->blueprint = $blueprint;
+        $this->nav = $nav;
+    }
+}
diff --git a/src/GraphQL/TypeRegistrar.php b/src/GraphQL/TypeRegistrar.php
index e3d3f7b18f2..546663eb6b2 100644
--- a/src/GraphQL/TypeRegistrar.php
+++ b/src/GraphQL/TypeRegistrar.php
@@ -7,12 +7,14 @@
 use Statamic\GraphQL\Types\AssetContainerType;
 use Statamic\GraphQL\Types\AssetInterface;
 use Statamic\GraphQL\Types\CollectionStructureType;
+use Statamic\GraphQL\Types\CollectionTreeBranchType;
 use Statamic\GraphQL\Types\CollectionType;
 use Statamic\GraphQL\Types\DateRangeType;
 use Statamic\GraphQL\Types\EntryInterface;
 use Statamic\GraphQL\Types\GlobalSetInterface;
 use Statamic\GraphQL\Types\JsonArgument;
 use Statamic\GraphQL\Types\LabeledValueType;
+use Statamic\GraphQL\Types\NavTreeBranchType;
 use Statamic\GraphQL\Types\NavType;
 use Statamic\GraphQL\Types\PageInterface;
 use Statamic\GraphQL\Types\RoleType;
@@ -20,7 +22,6 @@
 use Statamic\GraphQL\Types\TableRowType;
 use Statamic\GraphQL\Types\TaxonomyType;
 use Statamic\GraphQL\Types\TermInterface;
-use Statamic\GraphQL\Types\TreeBranchType;
 use Statamic\GraphQL\Types\UserGroupType;
 use Statamic\GraphQL\Types\UserType;
 
@@ -44,11 +45,18 @@ public function register()
         GraphQL::addType(TaxonomyType::class);
         GraphQL::addType(AssetContainerType::class);
         GraphQL::addType(NavType::class);
-        GraphQL::addType(TreeBranchType::class);
+        GraphQL::addType(CollectionTreeBranchType::class);
+        GraphQL::addType(NavTreeBranchType::class);
         GraphQL::addType(UserType::class);
         GraphQL::addType(UserGroupType::class);
         GraphQL::addType(RoleType::class);
         GraphQL::addType(TableRowType::class);
+        GraphQL::addType(PageInterface::class);
+        GraphQL::addType(EntryInterface::class);
+        GraphQL::addType(TermInterface::class);
+        GraphQL::addType(AssetInterface::class);
+        GraphQL::addType(GlobalSetInterface::class);
+
         PageInterface::addTypes();
         EntryInterface::addTypes();
         TermInterface::addTypes();
diff --git a/src/GraphQL/Types/AssetInterface.php b/src/GraphQL/Types/AssetInterface.php
index fc1dfb4e5e7..5e0943e54bd 100644
--- a/src/GraphQL/Types/AssetInterface.php
+++ b/src/GraphQL/Types/AssetInterface.php
@@ -119,8 +119,6 @@ public function resolveType(Asset $asset)
 
     public static function addTypes()
     {
-        GraphQL::addType(self::class);
-
         GraphQL::addTypes(AssetContainer::all()->each(function ($container) {
             $container->blueprint()->addGqlTypes();
         })->mapInto(AssetType::class)->all());
diff --git a/src/GraphQL/Types/CollectionStructureType.php b/src/GraphQL/Types/CollectionStructureType.php
index 4aabe0a625f..88487b8fe3d 100644
--- a/src/GraphQL/Types/CollectionStructureType.php
+++ b/src/GraphQL/Types/CollectionStructureType.php
@@ -9,4 +9,9 @@ class CollectionStructureType extends StructureType
     protected $attributes = [
         'name' => self::NAME,
     ];
+
+    protected function getTreeBranchType(): string
+    {
+        return CollectionTreeBranchType::NAME;
+    }
 }
diff --git a/src/GraphQL/Types/CollectionTreeBranchType.php b/src/GraphQL/Types/CollectionTreeBranchType.php
new file mode 100644
index 00000000000..c1c691387fc
--- /dev/null
+++ b/src/GraphQL/Types/CollectionTreeBranchType.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Statamic\GraphQL\Types;
+
+use Statamic\Facades\GraphQL;
+
+class CollectionTreeBranchType extends TreeBranchType
+{
+    const NAME = 'CollectionTreeBranch';
+
+    public function fields(): array
+    {
+        $fields = [
+            'entry' => [
+                'type' => GraphQL::type(EntryInterface::NAME),
+                'resolve' => function ($branch) {
+                    return $branch['page']->entry();
+                },
+            ],
+        ];
+
+        $fields['page'] = $fields['entry'];
+        $fields['page']['deprecationReason'] = 'Replaced by `entry`';
+
+        return array_merge(parent::fields(), $fields);
+    }
+}
diff --git a/src/GraphQL/Types/EntryInterface.php b/src/GraphQL/Types/EntryInterface.php
index 22e527d19ea..ce4b4b51091 100644
--- a/src/GraphQL/Types/EntryInterface.php
+++ b/src/GraphQL/Types/EntryInterface.php
@@ -61,18 +61,13 @@ public function fields(): array
             ],
         ];
 
-        foreach ($this->extraFields() as $field => $closure) {
+        foreach (GraphQL::getExtraTypeFields(static::NAME) as $field => $closure) {
             $fields[$field] = $closure();
         }
 
         return $fields;
     }
 
-    protected function extraFields()
-    {
-        return GraphQL::getExtraTypeFields(static::NAME);
-    }
-
     public function resolveType($entry)
     {
         $type = GraphQL::type(
@@ -84,8 +79,6 @@ public function resolveType($entry)
 
     public static function addTypes()
     {
-        GraphQL::addType(self::class);
-
         $combinations = Collection::all()
             ->flatMap(function ($collection) {
                 return $collection
@@ -96,11 +89,8 @@ public static function addTypes()
                     });
             });
 
-        GraphQL::addTypes($combinations->flatMap(function ($item) {
-            return [
-                new EntryType($item['collection'], $item['blueprint']),
-                new EntryPageType($item['collection'], $item['blueprint']),
-            ];
+        GraphQL::addTypes($combinations->map(function ($item) {
+            return new EntryType($item['collection'], $item['blueprint']);
         })->all());
     }
 }
diff --git a/src/GraphQL/Types/EntryPageType.php b/src/GraphQL/Types/EntryPageType.php
deleted file mode 100644
index 47b95a1734d..00000000000
--- a/src/GraphQL/Types/EntryPageType.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace Statamic\GraphQL\Types;
-
-use Statamic\Contracts\Entries\Collection;
-use Statamic\Facades\GraphQL;
-use Statamic\Fields\Blueprint;
-use Statamic\Support\Str;
-
-class EntryPageType extends EntryType
-{
-    public static function buildName(Collection $collection, Blueprint $blueprint): string
-    {
-        return 'EntryPage_'.Str::studly($collection->handle()).'_'.Str::studly($blueprint->handle());
-    }
-
-    public function interfaces(): array
-    {
-        return [
-            GraphQL::type(PageInterface::NAME),
-        ];
-    }
-
-    public function fields(): array
-    {
-        return $this->blueprint->fields()->toGql()
-            ->merge((new PageInterface)->fields())
-            ->merge(collect(GraphQL::getExtraTypeFields(EntryInterface::NAME))->map(function ($closure) {
-                return $closure();
-            }))
-            ->merge(collect(GraphQL::getExtraTypeFields($this->name))->map(function ($closure) {
-                return $closure();
-            }))
-            ->map(function ($arr) {
-                if (is_array($arr)) {
-                    $arr['resolve'] = $arr['resolve'] ?? $this->resolver();
-                }
-
-                return $arr;
-            })
-            ->all();
-    }
-}
diff --git a/src/GraphQL/Types/GlobalSetInterface.php b/src/GraphQL/Types/GlobalSetInterface.php
index 86287de956c..c59161db045 100644
--- a/src/GraphQL/Types/GlobalSetInterface.php
+++ b/src/GraphQL/Types/GlobalSetInterface.php
@@ -45,8 +45,6 @@ public function resolveType($globals)
 
     public static function addTypes()
     {
-        GraphQL::addType(self::class);
-
         GraphQL::addTypes(GlobalSet::all()->each(function ($globals) {
             optional($globals->blueprint())->addGqlTypes();
         })->mapInto(GlobalSetType::class)->all());
diff --git a/src/GraphQL/Types/NavBasicPageType.php b/src/GraphQL/Types/NavBasicPageType.php
new file mode 100644
index 00000000000..3cb6f2ea8f2
--- /dev/null
+++ b/src/GraphQL/Types/NavBasicPageType.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Statamic\GraphQL\Types;
+
+use Statamic\Contracts\GraphQL\ResolvesValues;
+use Statamic\Contracts\Structures\Nav;
+use Statamic\Facades\GraphQL;
+use Statamic\Support\Str;
+
+class NavBasicPageType extends \Rebing\GraphQL\Support\Type
+{
+    protected $nav;
+
+    public function __construct($nav)
+    {
+        $this->nav = $nav;
+        $this->attributes['name'] = static::buildName($nav);
+    }
+
+    public static function buildName(Nav $nav): string
+    {
+        return 'NavBasicPage_'.Str::studly($nav->handle());
+    }
+
+    public function interfaces(): array
+    {
+        return [
+            GraphQL::type(PageInterface::NAME),
+            GraphQL::type(NavPageInterface::buildName($this->nav)),
+        ];
+    }
+
+    public function fields(): array
+    {
+        return collect()
+            ->merge((new NavPageInterface($this->nav))->fields())
+            ->merge((new PageInterface)->fields())
+            ->map(function ($field) {
+                if (is_array($field)) {
+                    $field['resolve'] = $this->resolver();
+                }
+
+                return $field;
+            })
+            ->all();
+    }
+
+    private function resolver()
+    {
+        return function (ResolvesValues $page, $args, $context, $info) {
+            return $page->resolveGqlValue($info->fieldName);
+        };
+    }
+}
diff --git a/src/GraphQL/Types/NavEntryPageType.php b/src/GraphQL/Types/NavEntryPageType.php
new file mode 100644
index 00000000000..7e386c7c9b9
--- /dev/null
+++ b/src/GraphQL/Types/NavEntryPageType.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace Statamic\GraphQL\Types;
+
+use Statamic\Contracts\Entries\Collection;
+use Statamic\Contracts\GraphQL\ResolvesValues;
+use Statamic\Facades\GraphQL;
+use Statamic\Fields\Blueprint;
+use Statamic\Structures\Nav;
+use Statamic\Support\Str;
+
+class NavEntryPageType extends \Rebing\GraphQL\Support\Type
+{
+    protected $nav;
+    protected $collection;
+    protected $blueprint;
+
+    public function __construct($nav, $collection, $blueprint)
+    {
+        $this->nav = $nav;
+        $this->collection = $collection;
+        $this->blueprint = $blueprint;
+        $this->attributes['name'] = static::buildName($nav, $collection, $blueprint);
+    }
+
+    public static function buildName(Nav $nav, Collection $collection, Blueprint $blueprint): string
+    {
+        return 'NavEntryPage_'.Str::studly($nav->handle()).'_'.Str::studly($collection->handle()).'_'.Str::studly($blueprint->handle());
+    }
+
+    public function interfaces(): array
+    {
+        return [
+            GraphQL::type(PageInterface::NAME),
+            GraphQL::type(EntryInterface::NAME),
+            GraphQL::type(NavPageInterface::buildName($this->nav)),
+        ];
+    }
+
+    public function fields(): array
+    {
+        return collect()
+            ->merge($this->blueprint->fields()->toGql())
+            ->merge((new NavPageInterface($this->nav))->fields())
+            ->merge((new PageInterface)->fields())
+            ->merge((new EntryInterface)->fields())
+            ->map(function ($arr) {
+                if (is_array($arr)) {
+                    $arr['resolve'] = $arr['resolve'] ?? $this->resolver();
+                }
+
+                return $arr;
+            })
+            ->all();
+    }
+
+    protected function resolver()
+    {
+        return function (ResolvesValues $page, $args, $context, $info) {
+            return $page->resolveGqlValue($info->fieldName);
+        };
+    }
+}
diff --git a/src/GraphQL/Types/NavPageInterface.php b/src/GraphQL/Types/NavPageInterface.php
new file mode 100644
index 00000000000..f464713edda
--- /dev/null
+++ b/src/GraphQL/Types/NavPageInterface.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Statamic\GraphQL\Types;
+
+use Rebing\GraphQL\Support\InterfaceType;
+use Statamic\Contracts\Structures\Nav;
+use Statamic\Support\Str;
+
+class NavPageInterface extends InterfaceType
+{
+    protected $nav;
+
+    public function __construct(Nav $nav)
+    {
+        $this->nav = $nav;
+        $this->attributes['name'] = static::buildName($nav);
+    }
+
+    public function fields(): array
+    {
+        return $this->nav->blueprint()->fields()->toGql()->all();
+    }
+
+    public static function buildName(Nav $nav): string
+    {
+        return 'NavPage_'.Str::studly($nav->handle());
+    }
+}
diff --git a/src/GraphQL/Types/NavTreeBranchType.php b/src/GraphQL/Types/NavTreeBranchType.php
new file mode 100644
index 00000000000..4831a7bf8fd
--- /dev/null
+++ b/src/GraphQL/Types/NavTreeBranchType.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Statamic\GraphQL\Types;
+
+use Statamic\Facades\GraphQL;
+
+class NavTreeBranchType extends TreeBranchType
+{
+    const NAME = 'NavTreeBranch';
+
+    public function fields(): array
+    {
+        return parent::fields() + [
+            'page' => [
+                'type' => GraphQL::type(PageInterface::NAME),
+            ],
+        ];
+    }
+}
diff --git a/src/GraphQL/Types/NavType.php b/src/GraphQL/Types/NavType.php
index 117d079cd09..79e554384aa 100644
--- a/src/GraphQL/Types/NavType.php
+++ b/src/GraphQL/Types/NavType.php
@@ -9,4 +9,9 @@ class NavType extends StructureType
     protected $attributes = [
         'name' => self::NAME,
     ];
+
+    protected function getTreeBranchType(): string
+    {
+        return NavTreeBranchType::NAME;
+    }
 }
diff --git a/src/GraphQL/Types/PageInterface.php b/src/GraphQL/Types/PageInterface.php
index b4b7d4f9752..e815a4af554 100644
--- a/src/GraphQL/Types/PageInterface.php
+++ b/src/GraphQL/Types/PageInterface.php
@@ -3,8 +3,9 @@
 namespace Statamic\GraphQL\Types;
 
 use Statamic\Facades\GraphQL;
+use Statamic\Facades\Nav;
 
-class PageInterface extends EntryInterface
+class PageInterface extends \Rebing\GraphQL\Support\InterfaceType
 {
     const NAME = 'PageInterface';
 
@@ -14,24 +15,64 @@ class PageInterface extends EntryInterface
 
     public function resolveType($page)
     {
-        if (! $entry = $page->entry()) {
-            return GraphQL::type(PageType::NAME);
-        }
+        $structure = $page->structure();
+
+        $type = ($entry = $page->entry())
+            ? NavEntryPageType::buildName($structure, $entry->collection(), $entry->blueprint())
+            : NavBasicPageType::buildName($structure);
 
-        return GraphQL::type(
-            EntryPageType::buildName($entry->collection(), $entry->blueprint())
-        );
+        return GraphQL::type($type);
     }
 
     public static function addTypes()
     {
-        GraphQL::addType(self::class);
-        GraphQL::addType(PageType::class);
+        $types = Nav::all()->flatMap(function ($nav) {
+            $types = array_merge([new NavBasicPageType($nav)], static::getNavEntryPageTypes($nav));
+
+            return array_merge([new NavPageInterface($nav)], $types);
+        })->all();
+
+        GraphQL::addTypes($types);
+    }
+
+    public function fields(): array
+    {
+        $fields = [
+            'id' => [
+                'type' => GraphQL::nonNull(GraphQL::id()),
+            ],
+            'title' => [
+                'type' => GraphQL::string(),
+            ],
+            'url' => [
+                'type' => GraphQL::string(),
+            ],
+            'permalink' => [
+                'type' => GraphQL::string(),
+            ],
+            'entry_id' => [
+                'type' => GraphQL::ID(),
+            ],
+        ];
+
+        foreach (GraphQL::getExtraTypeFields(static::NAME) as $field => $closure) {
+            $fields[$field] = $closure();
+        }
+
+        return $fields;
     }
 
-    protected function extraFields()
+    private static function getNavEntryPageTypes($nav)
     {
-        return collect(GraphQL::getExtraTypeFields(static::NAME))
-            ->merge(GraphQL::getExtraTypeFields(EntryInterface::NAME));
+        return $nav->collections()->flatMap(function ($collection) use ($nav) {
+            return $collection
+                ->entryBlueprints()
+                ->each->addGqlTypes()
+                ->map(function ($blueprint) use ($nav, $collection) {
+                    return compact('nav', 'collection', 'blueprint');
+                });
+        })->map(function ($item) {
+            return new NavEntryPageType($item['nav'], $item['collection'], $item['blueprint']);
+        })->all();
     }
 }
diff --git a/src/GraphQL/Types/PageType.php b/src/GraphQL/Types/PageType.php
deleted file mode 100644
index 41a6a55d700..00000000000
--- a/src/GraphQL/Types/PageType.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Statamic\GraphQL\Types;
-
-use Statamic\Facades\GraphQL;
-use Statamic\Fields\Value;
-use Statamic\Structures\Page;
-
-class PageType extends \Rebing\GraphQL\Support\Type
-{
-    const NAME = 'Page';
-
-    protected $attributes = [
-        'name' => self::NAME,
-    ];
-
-    public function interfaces(): array
-    {
-        return [
-            GraphQL::type(PageInterface::NAME),
-        ];
-    }
-
-    public function fields(): array
-    {
-        return collect()
-            ->merge((new PageInterface)->fields())
-            ->map(function ($field) {
-                if (is_array($field)) {
-                    $field['resolve'] = $this->resolver();
-                }
-
-                return $field;
-            })
-            ->all();
-    }
-
-    private function resolver()
-    {
-        return function (Page $page, $args, $context, $info) {
-            $value = $page->augmentedValue($info->fieldName);
-
-            if ($value instanceof Value) {
-                $value = $value->value();
-            }
-
-            return $value;
-        };
-    }
-}
diff --git a/src/GraphQL/Types/StructureType.php b/src/GraphQL/Types/StructureType.php
index 3ca03bac0cd..2878e4dfac0 100644
--- a/src/GraphQL/Types/StructureType.php
+++ b/src/GraphQL/Types/StructureType.php
@@ -7,7 +7,7 @@
 use Statamic\Structures\TreeBuilder;
 use Statamic\Support\Str;
 
-class StructureType extends \Rebing\GraphQL\Support\Type
+abstract class StructureType extends \Rebing\GraphQL\Support\Type
 {
     public function fields(): array
     {
@@ -25,7 +25,7 @@ public function fields(): array
                 'type' => GraphQL::nonNull(GraphQL::boolean()),
             ],
             'tree' => [
-                'type' => GraphQL::listOf(GraphQL::type(TreeBranchType::NAME)),
+                'type' => GraphQL::listOf(GraphQL::type($this->getTreeBranchType())),
                 'args' => [
                     'site' => [
                         'type' => GraphQL::string(),
@@ -58,4 +58,6 @@ private function resolver()
             }
         };
     }
+
+    abstract protected function getTreeBranchType(): string;
 }
diff --git a/src/GraphQL/Types/TermInterface.php b/src/GraphQL/Types/TermInterface.php
index 532e3b3bd53..04ac7c70775 100644
--- a/src/GraphQL/Types/TermInterface.php
+++ b/src/GraphQL/Types/TermInterface.php
@@ -62,8 +62,6 @@ public function resolveType(Term $term)
 
     public static function addTypes()
     {
-        GraphQL::addType(self::class);
-
         $combinations = Taxonomy::all()
             ->flatMap(function ($taxonomy) {
                 return $taxonomy
diff --git a/src/GraphQL/Types/TreeBranchType.php b/src/GraphQL/Types/TreeBranchType.php
index 814b5f028e6..2a077c7502d 100644
--- a/src/GraphQL/Types/TreeBranchType.php
+++ b/src/GraphQL/Types/TreeBranchType.php
@@ -4,13 +4,12 @@
 
 use Statamic\Facades\GraphQL;
 
-class TreeBranchType extends \Rebing\GraphQL\Support\Type
+abstract class TreeBranchType extends \Rebing\GraphQL\Support\Type
 {
-    const NAME = 'TreeBranch';
-
-    protected $attributes = [
-        'name' => self::NAME,
-    ];
+    public function __construct()
+    {
+        $this->attributes['name'] = static::NAME;
+    }
 
     public function fields(): array
     {
@@ -18,11 +17,8 @@ public function fields(): array
             'depth' => [
                 'type' => GraphQL::nonNull(GraphQL::int()),
             ],
-            'page' => [
-                'type' => GraphQL::type(PageInterface::NAME),
-            ],
             'children' => [
-                'type' => GraphQL::listOf(GraphQL::type(self::NAME)),
+                'type' => GraphQL::listOf(GraphQL::type(static::NAME)),
             ],
         ];
     }
diff --git a/src/Http/Controllers/CP/Collections/CollectionStructureController.php b/src/Http/Controllers/CP/Collections/CollectionTreeController.php
similarity index 83%
rename from src/Http/Controllers/CP/Collections/CollectionStructureController.php
rename to src/Http/Controllers/CP/Collections/CollectionTreeController.php
index 1ffa78b57ce..75d3e098def 100644
--- a/src/Http/Controllers/CP/Collections/CollectionStructureController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionTreeController.php
@@ -4,13 +4,29 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
+use Statamic\Contracts\Entries\Collection;
 use Statamic\Facades\Entry;
+use Statamic\Facades\Site;
 use Statamic\Facades\User;
 use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Structures\TreeBuilder;
 use Statamic\Support\Arr;
 
-class CollectionStructureController extends CpController
+class CollectionTreeController extends CpController
 {
+    public function index(Request $request, Collection $collection)
+    {
+        $site = $request->site ?? Site::selected()->handle();
+
+        $pages = (new TreeBuilder)->buildForController([
+            'structure' => $collection->structure(),
+            'include_home' => true,
+            'site' => $site,
+        ]);
+
+        return ['pages' => $pages];
+    }
+
     public function update(Request $request, $collection)
     {
         $this->authorize('reorder', $collection);
@@ -33,7 +49,7 @@ public function update(Request $request, $collection)
         $tree->tree($contents)->save();
     }
 
-    protected function toTree($items)
+    private function toTree($items)
     {
         return collect($items)->map(function ($item) {
             return Arr::removeNullValues([
diff --git a/src/Http/Controllers/CP/Navigation/NavigationBlueprintController.php b/src/Http/Controllers/CP/Navigation/NavigationBlueprintController.php
new file mode 100644
index 00000000000..c0d3006e083
--- /dev/null
+++ b/src/Http/Controllers/CP/Navigation/NavigationBlueprintController.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Navigation;
+
+use Illuminate\Http\Request;
+use Statamic\Facades\Nav;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Http\Controllers\CP\Fields\ManagesBlueprints;
+
+class NavigationBlueprintController extends CpController
+{
+    use ManagesBlueprints;
+
+    public function __construct()
+    {
+        $this->middleware(\Illuminate\Auth\Middleware\Authorize::class.':configure fields');
+    }
+
+    public function edit($nav)
+    {
+        if (! $nav = Nav::find($nav)) {
+            return $this->pageNotFound();
+        }
+
+        $blueprint = $nav->blueprint();
+
+        return view('statamic::navigation.blueprints.edit', [
+            'nav' => $nav,
+            'blueprint' => $blueprint,
+            'blueprintVueObject' => $this->toVueObject($blueprint),
+        ]);
+    }
+
+    public function update(Request $request, $nav)
+    {
+        if (! $nav = Nav::find($nav)) {
+            return $this->pageNotFound();
+        }
+
+        $request->validate(['sections' => 'array']);
+
+        $this->updateBlueprint($request, $nav->blueprint());
+    }
+}
diff --git a/src/Http/Controllers/CP/Structures/NavigationController.php b/src/Http/Controllers/CP/Navigation/NavigationController.php
similarity index 89%
rename from src/Http/Controllers/CP/Structures/NavigationController.php
rename to src/Http/Controllers/CP/Navigation/NavigationController.php
index ef59582b519..a5db1e3ced8 100644
--- a/src/Http/Controllers/CP/Structures/NavigationController.php
+++ b/src/Http/Controllers/CP/Navigation/NavigationController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Statamic\Http\Controllers\CP\Structures;
+namespace Statamic\Http\Controllers\CP\Navigation;
 
 use Illuminate\Http\Request;
 use Statamic\Contracts\Structures\Nav as NavContract;
@@ -83,6 +83,7 @@ public function show(Request $request, $nav)
                     'url' => $tree->showUrl(),
                 ];
             })->values()->all(),
+            'blueprint' => $nav->blueprint()->toPublishArray(),
         ]);
     }
 
@@ -92,7 +93,7 @@ public function update(Request $request, $nav)
 
         $this->authorize('update', $nav, __('You are not authorized to configure navs.'));
 
-        $fields = $this->editFormBlueprint()->fields()->addValues($request->all());
+        $fields = $this->editFormBlueprint($nav)->fields()->addValues($request->all());
 
         $fields->validate();
 
@@ -151,7 +152,7 @@ public function store(Request $request)
         return ['redirect' => $structure->showUrl()];
     }
 
-    public function editFormBlueprint()
+    public function editFormBlueprint($nav)
     {
         $contents = [
             'name' => [
@@ -168,6 +169,14 @@ public function editFormBlueprint()
             'options' => [
                 'display' => __('Options'),
                 'fields' => [
+                    'blueprint' => [
+                        'type' => 'html',
+                        'instructions' => __('statamic::messages.navigation_configure_blueprint_instructions'),
+                        'html' => ''.
+                            '<div class="text-xs">'.
+                            '   <a href="'.cp_route('navigation.blueprint.edit', $nav->handle()).'" class="text-blue">'.__('Edit').'</a>'.
+                            '</div>',
+                    ],
                     'collections' => [
                         'display' => __('Collections'),
                         'instructions' => __('statamic::messages.navigation_configure_collections_instructions'),
diff --git a/src/Http/Controllers/CP/Navigation/NavigationPagesController.php b/src/Http/Controllers/CP/Navigation/NavigationPagesController.php
new file mode 100644
index 00000000000..7430a9807d4
--- /dev/null
+++ b/src/Http/Controllers/CP/Navigation/NavigationPagesController.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Navigation;
+
+use Illuminate\Http\Request;
+use Statamic\Facades\Nav;
+use Statamic\Fields\Blueprint;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Structures\Page;
+
+class NavigationPagesController extends CpController
+{
+    /**
+     * The "create" action, which doesn't actually render the page, but rather
+     * returns values, meta, etc for the page editor component.
+     */
+    public function create(Request $request, $nav)
+    {
+        $nav = Nav::find($nav);
+
+        $blueprint = $nav->blueprint();
+
+        $page = (new Page)
+            ->setTree($nav->in($request->site))
+            ->setEntry($request->entry);
+
+        [$values, $meta] = $this->extractValuesAndMeta($page, $blueprint);
+
+        if ($entry = $page->entry()) {
+            [$originValues, $originMeta] = $this->extractValuesAndMeta($entry, $blueprint);
+        }
+
+        return [
+            'values' => $values,
+            'meta' => $meta,
+            'originValues' => $originValues ?? null,
+            'originMeta' => $originMeta ?? null,
+            'localizedFields' => $this->getLocalizedFields($page),
+            'syncableFields' => $this->getSyncableFields($nav, $entry),
+        ];
+    }
+
+    /**
+     * The "edit" action, which doesn't actually render the page, but rather
+     * returns values, meta, etc for the the page editor component.
+     */
+    public function edit(Request $request, $nav, $page)
+    {
+        $nav = Nav::find($nav);
+
+        $blueprint = $nav->blueprint();
+
+        $page = $nav->in($request->site)->find($page);
+
+        [$values, $meta] = $this->extractValuesAndMeta($page, $blueprint);
+
+        if ($entry = $page->entry()) {
+            [$originValues, $originMeta] = $this->extractValuesAndMeta($entry, $blueprint);
+        }
+
+        return [
+            'values' => $values,
+            'meta' => $meta,
+            'originValues' => $originValues ?? null,
+            'originMeta' => $originMeta ?? null,
+            'localizedFields' => $this->getLocalizedFields($page),
+            'syncableFields' => $this->getSyncableFields($nav, $entry),
+        ];
+    }
+
+    private function getLocalizedFields($page)
+    {
+        $fields = $page->pageData()->keys();
+
+        if ($page->hasCustomTitle()) {
+            $fields[] = 'title';
+        }
+
+        if ($page->hasCustomUrl()) {
+            $fields[] = 'url';
+        }
+
+        return $fields;
+    }
+
+    private function getSyncableFields($nav, $entry)
+    {
+        $navFields = $nav->blueprint()->fields()->all()->keys();
+
+        if (! $entry) {
+            return $navFields;
+        }
+
+        return $entry->blueprint()
+            ->fields()->all()->keys()
+            ->intersect($navFields)->values()
+            ->flip()->forget('url')
+            ->flip()->all();
+    }
+
+    private function extractValuesAndMeta($page, $blueprint)
+    {
+        $values = $page instanceof Page
+            ? $this->getPageValues($page)
+            : $this->getEntryValues($page);
+
+        $fields = $blueprint
+            ->ensureField('title', [])
+            ->ensureField('url', [])
+            ->fields()
+            ->addValues($values)
+            ->preProcess();
+
+        $values = $fields->values();
+
+        return [$values->all(), $fields->meta()];
+    }
+
+    private function getPageValues($page)
+    {
+        $entryValues = ($entry = $page->entry())
+            ? $this->getEntryValues($entry)
+            : collect();
+
+        return collect($entryValues)
+            ->merge($page->pageData())
+            ->merge([
+                'title' => $page->title(),
+                'url' => $page->reference() ? null : $page->url(),
+            ])->all();
+    }
+
+    private function getEntryValues($entry)
+    {
+        // The values should only be data merged with the origin data.
+        // We don't want injected collection values, which $entry->values() would have given us.
+        $target = $entry;
+        $values = $target->data();
+        while ($target->hasOrigin()) {
+            $target = $target->origin();
+            $values = $target->data()->merge($values);
+        }
+
+        return $values->all();
+    }
+
+    /**
+     * The "update" action, which doesn't actually update the page, but just
+     * validates it. The Vue component will "save" the data back into the
+     * component, where all edited pages will be submitted together.
+     */
+    public function update(Request $request, $nav)
+    {
+        $request->validate(['type' => 'required|in:url,entry']);
+
+        $nav = Nav::find($nav);
+
+        $blueprint = $this->ensureFields($nav->blueprint(), $request);
+
+        $blueprint->fields()
+            ->addValues($request->values)
+            ->validator()
+            ->withRules($this->extraRules($request))
+            ->validate();
+    }
+
+    private function ensureFields(Blueprint $blueprint, $request)
+    {
+        // Add fields so that the validation rules will display with the correct names
+        if ($request->type === 'url') {
+            $blueprint
+                ->ensureField('title', ['display' => __('Title')])
+                ->ensureField('url', ['display' => __('URL')]);
+        }
+
+        return $blueprint;
+    }
+
+    private function extraRules($request)
+    {
+        return $request->type === 'url' ? [
+            'title' => ['required_without:url'],
+            'url' => ['required_without:title'],
+        ] : [];
+    }
+}
diff --git a/src/Http/Controllers/CP/Navigation/NavigationTreeController.php b/src/Http/Controllers/CP/Navigation/NavigationTreeController.php
new file mode 100644
index 00000000000..beecc0f3e45
--- /dev/null
+++ b/src/Http/Controllers/CP/Navigation/NavigationTreeController.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace Statamic\Http\Controllers\CP\Navigation;
+
+use Facades\Statamic\Structures\BranchIdGenerator;
+use Illuminate\Http\Request;
+use Statamic\Facades\Nav;
+use Statamic\Facades\Site;
+use Statamic\Fields\Blueprint;
+use Statamic\Http\Controllers\CP\CpController;
+use Statamic\Structures\TreeBuilder;
+use Statamic\Support\Arr;
+
+class NavigationTreeController extends CpController
+{
+    private $data;
+    private $generatedIds = [];
+
+    public function index(Request $request, $handle)
+    {
+        $nav = Nav::find($handle);
+
+        $site = $request->site ?? Site::selected()->handle();
+
+        $nav->in($site)->ensureBranchIds();
+
+        $pages = (new TreeBuilder)->buildForController([
+            'structure' => $nav,
+            'include_home' => true,
+            'site' => $site,
+        ]);
+
+        return ['pages' => $pages];
+    }
+
+    public function update(Request $request, $nav)
+    {
+        $nav = Nav::find($nav);
+
+        $tree = $nav->in($request->site);
+
+        $this->data = $this->flattenExistingBranchData([], $tree->tree());
+
+        $blueprint = $nav->blueprint()
+            ->ensureField('title', ['type' => 'text'])
+            ->ensureField('url', ['type' => 'text']);
+
+        $this->updateData($request->data, $blueprint);
+
+        $tree = $this->reorderTree($request->pages);
+
+        $nav->in($request->site)->tree($tree)->save();
+
+        return [
+            'generatedIds' => $this->generatedIds,
+        ];
+    }
+
+    private function updateData(array $data, Blueprint $blueprint)
+    {
+        collect($data)->each(function ($branch, $id) use ($blueprint) {
+            $data = $blueprint->fields()
+                ->addValues($branch['values'] ?? [])
+                ->process()
+                ->values()
+                ->only($branch['localizedFields'] ?? []);
+
+            if ($branch['new'] ?? false) {
+                $newId = BranchIdGenerator::generate();
+                $this->generatedIds[$id] = $newId;
+                $id = $newId;
+            }
+
+            $this->data[$id] = Arr::removeNullValues([
+                'id' => $id,
+                'entry' => $branch['entry'] ?? null,
+                'title' => $data->pull('title'),
+                'url' => $data->pull('url'),
+                'data' => $data->all(),
+            ]);
+        });
+    }
+
+    private function flattenExistingBranchData($data, $branches)
+    {
+        foreach ($branches as $branch) {
+            $data[$branch['id']] = Arr::except($branch, 'children');
+
+            if ($children = $branch['children'] ?? false) {
+                $data = $data + $this->flattenExistingBranchData($data, $children);
+            }
+        }
+
+        return $data;
+    }
+
+    private function reorderTree($tree)
+    {
+        return collect($tree)->map(function ($branch) {
+            $id = $this->generatedIds[$branch['id']] ?? $branch['id'];
+
+            $item = $this->data[$id];
+
+            if ($children = $branch['children']) {
+                $item['children'] = $this->reorderTree($children);
+            }
+
+            return $item;
+        })->all();
+    }
+}
diff --git a/src/Http/Controllers/CP/Structures/StructurePagesController.php b/src/Http/Controllers/CP/Structures/StructurePagesController.php
deleted file mode 100644
index f0e600a6b73..00000000000
--- a/src/Http/Controllers/CP/Structures/StructurePagesController.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Statamic\Http\Controllers\CP\Structures;
-
-use Illuminate\Http\Request;
-use Statamic\Facades\Site;
-use Statamic\Facades\Structure;
-use Statamic\Http\Controllers\CP\CpController;
-use Statamic\Structures\TreeBuilder;
-use Statamic\Support\Arr;
-
-class StructurePagesController extends CpController
-{
-    public function index(Request $request, $handle)
-    {
-        $structure = Structure::find($handle);
-        $site = $request->site ?? Site::selected()->handle();
-
-        $pages = (new TreeBuilder)->buildForController([
-            'structure' => $handle,
-            'include_home' => true,
-            'site' => $site,
-        ]);
-
-        return ['pages' => $pages];
-    }
-
-    public function store(Request $request, $structure)
-    {
-        $tree = $this->toTree($request->pages);
-
-        Structure::find($structure)
-            ->in($request->site)
-            ->tree($tree)
-            ->save();
-    }
-
-    protected function toTree($items)
-    {
-        return collect($items)->map(function ($item) {
-            return Arr::removeNullValues([
-                'entry' => $ref = $item['id'] ?? null,
-                'title' => $ref ? null : ($item['title'] ?? null),
-                'url' => $ref ? null : ($item['url'] ?? null),
-                'children' => $this->toTree($item['children']),
-            ]);
-        })->all();
-    }
-}
diff --git a/src/Structures/AugmentedPage.php b/src/Structures/AugmentedPage.php
index 3dc72e389ad..8f699daa927 100644
--- a/src/Structures/AugmentedPage.php
+++ b/src/Structures/AugmentedPage.php
@@ -7,10 +7,13 @@
 
 class AugmentedPage extends AugmentedEntry
 {
+    protected $page;
     protected $hasEntry = false;
 
     public function __construct($page)
     {
+        $this->page = $page;
+
         if ($page->reference() && $page->referenceExists()) {
             $this->hasEntry = true;
             parent::__construct($page->entry());
@@ -21,13 +24,17 @@ public function __construct($page)
 
     public function keys()
     {
-        $keys = $this->hasEntry
+        $keys = collect($this->hasEntry
             ? parent::keys()
-            : ['title', 'url', 'uri', 'permalink'];
+            : ['title', 'url', 'uri', 'permalink', 'id']);
+
+        $keys = $keys
+            ->merge($this->page->data()->keys())
+            ->merge(['entry_id']);
+
+        $keys = Statamic::isApiRoute() ? $this->apiKeys($keys) : $keys;
 
-        return Statamic::isApiRoute()
-            ? $this->apiKeys($keys)
-            : $keys;
+        return $keys->unique()->sort()->values()->all();
     }
 
     private function apiKeys($keys)
@@ -35,14 +42,39 @@ private function apiKeys($keys)
         return collect($keys)
             ->reject(function ($key) {
                 return in_array($key, ['parent']);
-            })
-            ->all();
+            });
     }
 
     protected function getFromData($key)
     {
-        return $this->hasEntry
-            ? parent::getFromData($key)
-            : null;
+        if ($key === 'title') {
+            return $this->page->title();
+        }
+
+        return $this->page->value($key);
+    }
+
+    protected function blueprintFields()
+    {
+        $fields = ($pageBlueprint = $this->page->blueprint())
+            ? $pageBlueprint->fields()->all()
+            : collect();
+
+        if ($this->page !== $this->data) {
+            $entryFields = $this->data->blueprint()->fields()->all();
+            $fields = $entryFields->merge($fields);
+        }
+
+        return $fields;
+    }
+
+    protected function id()
+    {
+        return $this->page->id();
+    }
+
+    protected function entryId()
+    {
+        return $this->page->reference();
     }
 }
diff --git a/src/Structures/BranchIdGenerator.php b/src/Structures/BranchIdGenerator.php
new file mode 100644
index 00000000000..f069fd2dfe9
--- /dev/null
+++ b/src/Structures/BranchIdGenerator.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Statamic\Structures;
+
+use Statamic\Support\Str;
+
+class BranchIdGenerator
+{
+    public function generate()
+    {
+        return (string) Str::uuid();
+    }
+}
diff --git a/src/Structures/BranchIds.php b/src/Structures/BranchIds.php
new file mode 100644
index 00000000000..d28794cfa68
--- /dev/null
+++ b/src/Structures/BranchIds.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Statamic\Structures;
+
+use Facades\Statamic\Structures\BranchIdGenerator;
+
+class BranchIds
+{
+    public function ensure(array $tree)
+    {
+        return collect($tree)->map(function ($branch) {
+            return $this->ensureIdOnBranch($branch);
+        })->all();
+    }
+
+    private function ensureIdOnBranch($branch)
+    {
+        $id = $branch['id'] ?? BranchIdGenerator::generate();
+
+        if ($branch['children'] ?? false) {
+            $branch['children'] = $this->ensure($branch['children']);
+        }
+
+        return array_merge(['id' => $id], $branch);
+    }
+}
diff --git a/src/Structures/CollectionTree.php b/src/Structures/CollectionTree.php
index f123b7b351c..96751864dd3 100644
--- a/src/Structures/CollectionTree.php
+++ b/src/Structures/CollectionTree.php
@@ -61,4 +61,9 @@ protected function repository()
     {
         return app(CollectionTreeRepository::class);
     }
+
+    public function idKey()
+    {
+        return 'entry';
+    }
 }
diff --git a/src/Structures/Nav.php b/src/Structures/Nav.php
index 7f1a71d7339..6d71eb61ffe 100644
--- a/src/Structures/Nav.php
+++ b/src/Structures/Nav.php
@@ -5,9 +5,11 @@
 use Statamic\Contracts\Structures\Nav as Contract;
 use Statamic\Contracts\Structures\NavTreeRepository;
 use Statamic\Data\ExistsAsFile;
+use Statamic\Events\NavBlueprintFound;
 use Statamic\Events\NavDeleted;
 use Statamic\Events\NavSaved;
 use Statamic\Facades;
+use Statamic\Facades\Blueprint;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Site;
 use Statamic\Facades\Stache;
@@ -104,4 +106,14 @@ public function existsIn($site)
     {
         return $this->trees()->has($site);
     }
+
+    public function blueprint()
+    {
+        $blueprint = Blueprint::find('navigation.'.$this->handle())
+            ?? Blueprint::makeFromFields([])->setHandle($this->handle())->setNamespace('navigation');
+
+        NavBlueprintFound::dispatch($blueprint, $this);
+
+        return $blueprint;
+    }
 }
diff --git a/src/Structures/NavTree.php b/src/Structures/NavTree.php
index 486d0118033..0f1b65ec864 100644
--- a/src/Structures/NavTree.php
+++ b/src/Structures/NavTree.php
@@ -2,6 +2,7 @@
 
 namespace Statamic\Structures;
 
+use Facades\Statamic\Structures\BranchIds;
 use Statamic\Contracts\Structures\NavTreeRepository;
 use Statamic\Events\NavTreeDeleted;
 use Statamic\Events\NavTreeSaved;
@@ -44,4 +45,15 @@ protected function repository()
     {
         return app(NavTreeRepository::class);
     }
+
+    public function ensureBranchIds()
+    {
+        $this->tree = BranchIds::ensure($oldTree = $this->tree);
+
+        if ($oldTree !== $this->tree) {
+            $this->save();
+        }
+
+        return $this;
+    }
 }
diff --git a/src/Structures/Page.php b/src/Structures/Page.php
index 9f54ba5b7c2..9a9dfad7cb6 100644
--- a/src/Structures/Page.php
+++ b/src/Structures/Page.php
@@ -11,6 +11,7 @@
 use Statamic\Contracts\Entries\Entry;
 use Statamic\Contracts\GraphQL\ResolvesValues as ResolvesValuesContract;
 use Statamic\Contracts\Routing\UrlBuilder;
+use Statamic\Contracts\Structures\Nav;
 use Statamic\Data\HasAugmentedInstance;
 use Statamic\Data\TracksQueriedColumns;
 use Statamic\Facades\Blink;
@@ -29,9 +30,11 @@ class Page implements Entry, Augmentable, Responsable, Protectable, JsonSerializ
     protected $parent;
     protected $children;
     protected $isRoot = false;
+    protected $id;
     protected $url;
     protected $title;
     protected $depth;
+    protected $data = [];
 
     public function setUrl($url)
     {
@@ -83,6 +86,16 @@ public function title()
         return optional($this->entry())->value('title');
     }
 
+    public function hasCustomTitle()
+    {
+        return $this->title !== null;
+    }
+
+    public function hasCustomUrl()
+    {
+        return $this->url !== null;
+    }
+
     public function setEntry($reference): self
     {
         if ($reference === null) {
@@ -227,6 +240,66 @@ public function setChildren(array $children): self
         return $this;
     }
 
+    public function setPageData(array $data): self
+    {
+        $this->data = $data;
+
+        return $this;
+    }
+
+    public function pageData()
+    {
+        return collect($this->data);
+    }
+
+    public function data()
+    {
+        $data = $this->pageData();
+
+        if ($entry = $this->entry()) {
+            $data = $entry->data()->merge($data);
+        }
+
+        return $data;
+    }
+
+    public function values()
+    {
+        $data = $this->pageData();
+
+        if ($entry = $this->entry()) {
+            $data = $entry->values()->merge($data);
+        }
+
+        return $data;
+    }
+
+    public function get(string $key, $fallback = null)
+    {
+        if ($value = $this->data[$key] ?? null) {
+            return $value;
+        }
+
+        if ($entry = $this->entry()) {
+            $value = $entry->get($key);
+        }
+
+        return $value ?? $fallback;
+    }
+
+    public function value(string $key)
+    {
+        if ($value = $this->data[$key] ?? null) {
+            return $value;
+        }
+
+        if ($entry = $this->entry()) {
+            $value = $entry->value($key);
+        }
+
+        return $value;
+    }
+
     public function pages()
     {
         $pages = (new Pages)
@@ -258,9 +331,16 @@ public function editUrl()
         return optional($this->entry())->editUrl();
     }
 
+    public function setId($id)
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
     public function id()
     {
-        return optional($this->entry())->id();
+        return $this->id;
     }
 
     public function in($site)
@@ -270,7 +350,7 @@ public function in($site)
                 return null;
             }
 
-            return $this->setEntry($entry->id());
+            return $this->structure()->in($site)->findByEntry($entry->id());
         }
 
         return $this;
@@ -316,7 +396,9 @@ public function private()
 
     public function blueprint()
     {
-        return optional($this->entry())->blueprint();
+        if ($this->structure() instanceof Nav) {
+            return $this->structure()->blueprint();
+        }
     }
 
     public function collection()
diff --git a/src/Structures/Pages.php b/src/Structures/Pages.php
index babe400cd81..f8528adce19 100644
--- a/src/Structures/Pages.php
+++ b/src/Structures/Pages.php
@@ -64,11 +64,13 @@ public function all()
             $page = (new Page)
                 ->setTree($this->tree)
                 ->setParent($this->parent)
+                ->setId($branch[$this->tree->idKey()] ?? null)
                 ->setEntry($branch['entry'] ?? null)
                 ->setUrl($branch['url'] ?? null)
                 ->setTitle($branch['title'] ?? null)
                 ->setDepth($this->depth)
-                ->setChildren($branch['children'] ?? []);
+                ->setChildren($branch['children'] ?? [])
+                ->setPageData($branch['data'] ?? []);
 
             if ($this->route) {
                 $page->setRoute($this->route);
diff --git a/src/Structures/Structure.php b/src/Structures/Structure.php
index 814dc21e4ce..65c1f57106e 100644
--- a/src/Structures/Structure.php
+++ b/src/Structures/Structure.php
@@ -86,10 +86,6 @@ public function validateTree(array $tree, string $locale): array
             return $tree;
         }
 
-        if (! empty($tree) && ! isset($tree[0]['entry'])) {
-            throw new \Exception('Root page must be an entry');
-        }
-
         throw_if(isset($tree[0]['children']), new \Exception('Root page cannot have children'));
 
         return $tree;
diff --git a/src/Structures/Tree.php b/src/Structures/Tree.php
index 6ca15dedea1..77cd0ecd6b1 100644
--- a/src/Structures/Tree.php
+++ b/src/Structures/Tree.php
@@ -24,6 +24,11 @@ abstract class Tree implements Contract, Localization
     protected $uriCacheEnabled = true;
     protected $syncOriginalProperties = ['tree'];
 
+    public function idKey()
+    {
+        return 'id';
+    }
+
     public function locale($locale = null)
     {
         return $this->fluentlyGetOrSet('locale')->args(func_get_args());
@@ -55,11 +60,7 @@ public function root()
             return null;
         }
 
-        if (! $root = $this->tree()[0] ?? null) {
-            return null;
-        }
-
-        return $root['entry'];
+        return $this->tree()[0] ?? null;
     }
 
     public function handle($handle = null)
@@ -78,9 +79,14 @@ public function parent()
             return null;
         }
 
+        $branch = $this->root();
+
         return (new Page)
             ->setTree($this)
-            ->setEntry($this->root())
+            ->setId($branch[$this->idKey()] ?? null)
+            ->setEntry($branch['entry'] ?? null)
+            ->setUrl($branch['url'] ?? null)
+            ->setTitle($branch['title'] ?? null)
             ->setRoute($this->route())
             ->setDepth(1)
             ->setRoot(true);
@@ -133,7 +139,22 @@ public function uriCacheEnabled()
         return $this->uriCacheEnabled;
     }
 
-    public function page(string $id): ?Page
+    /**
+     * @deprecated  Use find() instead.
+     */
+    public function page($id): ?Page
+    {
+        return $this->find($id);
+    }
+
+    public function find($id): ?Page
+    {
+        return $this->flattenedPages()
+            ->keyBy->id()
+            ->get($id);
+    }
+
+    public function findByEntry($id)
     {
         return $this->flattenedPages()
             ->filter->reference()
@@ -228,9 +249,9 @@ public function appendTo($parent, $page)
         }
 
         if (is_string($page)) {
-            $page = ['entry' => $page];
+            $page = [$this->idKey() => $page];
         } elseif (is_object($page)) {
-            $page = ['entry' => $page->id()];
+            $page = [$this->idKey() => $page->id()];
         }
 
         if ($parent) {
@@ -247,7 +268,7 @@ private function appendToInBranches($parent, $page, $branches)
         foreach ($branches as &$branch) {
             $children = $branch['children'] ?? [];
 
-            if ($branch['entry'] === $parent) {
+            if ($branch[$this->idKey()] === $parent) {
                 $children[] = $page;
                 $branch['children'] = $children;
                 break;
@@ -271,7 +292,7 @@ public function move($entry, $target)
             return $this;
         }
 
-        if ($this->structure()->expectsRoot() && Arr::get($this->tree, '0.entry') === $target) {
+        if ($this->structure()->expectsRoot() && Arr::get($this->tree, '0.id') === $target) {
             throw new \Exception('Root page cannot have children');
         }
 
@@ -298,7 +319,7 @@ private function removeFromInBranches($entry, $branches)
         $match = null;
 
         foreach ($branches as $key => &$branch) {
-            if ($branch['entry'] === $entry) {
+            if ($branch[$this->idKey()] === $entry) {
                 $match = $branch;
                 unset($branches[$key]);
                 break;
diff --git a/src/Structures/TreeBuilder.php b/src/Structures/TreeBuilder.php
index 307ed1ff22d..fd73c36b394 100644
--- a/src/Structures/TreeBuilder.php
+++ b/src/Structures/TreeBuilder.php
@@ -85,8 +85,10 @@ protected function transformTreeForController($tree)
 
             return [
                 'id'          => $page->id(),
-                'title'       => $page->title(),
-                'url'         => $page->url(),
+                'entry'       => $page->reference(),
+                'title'       => $page->hasCustomTitle() ? $page->title() : null,
+                'entry_title' => $page->referenceExists() ? $page->entry()->value('title') : null,
+                'url'         => $page->referenceExists() ? null : $page->url(),
                 'edit_url'    => $page->editUrl(),
                 'can_delete'  => $page->referenceExists() ? User::current()->can('delete', $page->entry()) : true,
                 'slug'        => $page->slug(),
diff --git a/tailwind.config.js b/tailwind.config.js
index 9914e5e52fa..2646873caf6 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -54,7 +54,9 @@ module.exports = {
     spacing: {
       'px':  '1px',
       '0':   '0',
+      'xs':  '2px',
       'sm':  '4px',
+      '.5':  '6px',
       '1':   '8px',
       '1.5': '12px',
       '2':   '16px',
diff --git a/tests/Data/AugmentedTestCase.php b/tests/Data/AugmentedTestCase.php
index 027e70b8965..dfe60a69fb4 100644
--- a/tests/Data/AugmentedTestCase.php
+++ b/tests/Data/AugmentedTestCase.php
@@ -13,12 +13,26 @@ class AugmentedTestCase extends TestCase
     use PreventSavingStacheItemsToDisk;
 
     protected function assertAugmentedCorrectly($expectations, $augmented)
+    {
+        $this->assertAllKeysAreAugmented($expectations, $augmented);
+        $this->assertAugmentedAsExpected($expectations, $augmented);
+    }
+
+    protected function assertSubsetAugmentedCorrectly($expectations, $augmented)
+    {
+        $this->assertAugmentedAsExpected($expectations, $augmented);
+    }
+
+    private function assertAllKeysAreAugmented($expectations, $augmented)
     {
         $this->assertEquals(
             collect($expectations)->keys()->sort()->values()->all(),
             $augmented->keys()
         );
+    }
 
+    private function assertAugmentedAsExpected($expectations, $augmented)
+    {
         foreach ($expectations as $key => $expectation) {
             $actual = $augmented->get($key);
 
@@ -29,6 +43,15 @@ protected function assertAugmentedCorrectly($expectations, $augmented)
             switch ($expectation['type']) {
                 case Value::class:
                     $this->assertSame($expectation['value'], $actual->value(), "Key '{$key}' does not match expected value.");
+
+                    if (isset($expectation['fieldtype'])) {
+                        $this->assertEquals(
+                            $expectation['fieldtype'],
+                            $actual->fieldtype()->handle(),
+                            "Key '{$key}' does not have the expected fieldtype."
+                        );
+                    }
+
                     break;
 
                 case Carbon::class:
diff --git a/tests/Data/Structures/AugmentedPageTest.php b/tests/Data/Structures/AugmentedPageTest.php
new file mode 100644
index 00000000000..4f98c65ff07
--- /dev/null
+++ b/tests/Data/Structures/AugmentedPageTest.php
@@ -0,0 +1,208 @@
+<?php
+
+namespace Tests\Data\Structures;
+
+use Mockery;
+use Statamic\Entries\Entry;
+use Statamic\Facades\Blueprint;
+use Statamic\Fields\Value;
+use Statamic\Structures\AugmentedPage;
+use Statamic\Structures\Page;
+use Tests\Data\AugmentedTestCase;
+
+class AugmentedPageTest extends AugmentedTestCase
+{
+    /** @test */
+    public function it_gets_page_keys()
+    {
+        $page = Mockery::mock(Page::class);
+        $page->shouldReceive('reference')->andReturnFalse();
+        $page->shouldReceive('data')->andReturn(collect(['one' => 'two', 'three' => 'four']));
+
+        $augmented = new AugmentedPage($page);
+
+        $expected = [
+            'id',
+            'entry_id',
+            'title',
+            'url',
+            'uri',
+            'permalink',
+            'one',
+            'three',
+        ];
+
+        $actual = $augmented->keys();
+
+        $this->assertEquals(
+            collect($expected)->sort()->values()->all(),
+            collect($actual)->sort()->values()->all()
+        );
+    }
+
+    /** @test */
+    public function it_gets_entry_keys()
+    {
+        $entryBlueprint = Blueprint::makeFromFields([
+            'title' => ['type' => 'text'],
+            'foo' => ['type' => 'text'],
+            'one' => ['type' => 'text'],
+        ])->setNamespace('collections.articles')->setHandle('article');
+
+        $pageBlueprint = Blueprint::makeFromFields([
+            'jane' => ['type' => 'text'],
+        ])->setNamespace('navs')->setHandle('pages');
+
+        $entry = Mockery::mock(Entry::class);
+        $entry->shouldReceive('values')->andReturn(collect([
+            'one' => 'two',
+            'three' => 'four',
+        ]));
+        $entry->shouldReceive('supplements')->andReturn(collect([
+            'alfa' => 'bravo',
+            'charlie' => 'delta',
+        ]));
+        $entry->shouldReceive('blueprint')->andReturn($entryBlueprint);
+
+        $page = Mockery::mock(Page::class);
+        $page->shouldReceive('reference')->andReturn('123');
+        $page->shouldReceive('referenceExists')->andReturnTrue();
+        $page->shouldReceive('entry')->andReturn($entry);
+        $page->shouldReceive('blueprint')->andReturn($pageBlueprint);
+        $page->shouldReceive('data')->andReturn(collect([
+            'john' => 'doe',
+            'jane' => 'doe',
+            'three' => 'four',
+        ]));
+
+        $augmented = new AugmentedPage($page);
+
+        $expected = [
+            // entry values
+            'one', 'three',
+            // entry supplements
+            'alfa', 'charlie',
+            // entry blueprint
+            'title', 'foo',
+            // augmented entry keys
+            'amp_url', 'api_url', 'collection', 'date', 'edit_url', 'id', 'is_entry',
+            'last_modified', 'locale', 'mount', 'order', 'permalink', 'private',
+            'published', 'slug', 'status', 'updated_at', 'updated_by', 'uri', 'url',
+            // page blueprint
+            'jane',
+            // page data
+            'john',
+            // page keys
+            'entry_id',
+        ];
+
+        $actual = $augmented->keys();
+
+        $this->assertEquals(
+            collect($expected)->sort()->values()->all(),
+            collect($actual)->sort()->values()->all()
+        );
+    }
+
+    /** @test */
+    public function it_gets_values_from_the_page()
+    {
+        $blueprint = Blueprint::makeFromFields([
+            'one' => ['type' => 'text'],
+            'three' => ['type' => 'text'],
+        ]);
+
+        $page = Mockery::mock(Page::class);
+        $page->shouldReceive('id')->andReturn('page-id');
+        $page->shouldReceive('reference')->andReturnFalse();
+        $page->shouldReceive('title')->andReturn('The Page Title');
+        $page->shouldReceive('blueprint')->andReturn($blueprint);
+        $page->shouldReceive('url')->andReturn('/the-url');
+        $page->shouldReceive('uri')->andReturn('/the-uri');
+        $page->shouldReceive('absoluteUrl')->andReturn('https://site.com/the-permalink');
+        $page->shouldReceive('data')->andReturn(collect(['one' => 'two', 'three' => 'four', 'five' => 'six']));
+        $page->shouldReceive('value')->with('one')->andReturn('two');
+        $page->shouldReceive('value')->with('three')->andReturn('four');
+        $page->shouldReceive('value')->with('five')->andReturn('six');
+
+        $augmented = new AugmentedPage($page);
+
+        $expectations = [
+            'title' => ['type' => 'string', 'value' => 'The Page Title'],
+            'url' => ['type' => 'string', 'value' => '/the-url'],
+            'uri' => ['type' => 'string', 'value' => '/the-uri'],
+            'permalink' => ['type' => 'string', 'value' => 'https://site.com/the-permalink'],
+            'one' => ['type' => Value::class, 'value' => 'two'],
+            'three' => ['type' => Value::class, 'value' => 'four'],
+            'five' => ['type' => 'string', 'value' => 'six'],
+            'id' => ['type' => 'string', 'value' => 'page-id'],
+            'entry_id' => ['type' => 'string', 'value' => null],
+        ];
+
+        $this->assertAugmentedCorrectly($expectations, $augmented);
+    }
+
+    /** @test */
+    public function it_gets_values_from_the_entry()
+    {
+        $entryBlueprint = Blueprint::makeFromFields([
+            'title' => ['type' => 'text'],
+            'one' => ['type' => 'text'],
+        ])->setNamespace('collections.articles')->setHandle('article');
+
+        $pageBlueprint = Blueprint::makeFromFields([
+            'one' => ['type' => 'textarea'],
+            'three' => ['type' => 'textarea'],
+        ])->setNamespace('navs')->setHandle('pages');
+
+        $entry = Mockery::mock(Entry::class);
+        $entry->shouldReceive('values')->andReturn(collect([
+            'title' => 'The Entry Title',
+            'one' => 'two',
+            'three' => 'four',
+            'five' => 'six',
+        ]));
+        $entry->shouldReceive('supplements')->andReturn(collect());
+        $entry->shouldReceive('value')->with('title')->andReturn('The Entry Title');
+        $entry->shouldReceive('value')->with('one')->andReturn('two');
+        $entry->shouldReceive('value')->with('three')->andReturnNull('four');
+        $entry->shouldReceive('value')->with('five')->andReturn('six');
+        $entry->shouldReceive('getSupplement')->with('title')->andReturnNull();
+        $entry->shouldReceive('getSupplement')->with('one')->andReturnNull();
+        $entry->shouldReceive('getSupplement')->with('three')->andReturnNull();
+        $entry->shouldReceive('getSupplement')->with('five')->andReturnNull();
+        $entry->shouldReceive('blueprint')->andReturn($entryBlueprint);
+        $entry->shouldReceive('url')->andReturn('/the-url');
+        $entry->shouldReceive('uri')->andReturn('/the-uri');
+        $entry->shouldReceive('id')->andReturn('123');
+        $entry->shouldReceive('absoluteUrl')->andReturn('https://site.com/the-permalink');
+
+        $page = Mockery::mock(Page::class);
+        $page->shouldReceive('id')->andReturn('page-id');
+        $page->shouldReceive('reference')->andReturn('123');
+        $page->shouldReceive('referenceExists')->andReturnTrue();
+        $page->shouldReceive('entry')->andReturn($entry);
+        $page->shouldReceive('blueprint')->andReturn($pageBlueprint);
+        $page->shouldReceive('data')->andReturn(collect(['one' => 'dos', 'three' => 'quatro', 'five' => 'seis']));
+        $page->shouldReceive('title')->andReturn('The Page Title');
+        $page->shouldReceive('value')->with('one')->andReturn('dos');
+        $page->shouldReceive('value')->with('three')->andReturn('quatro');
+        $page->shouldReceive('value')->with('five')->andReturn('seis');
+
+        $augmented = new AugmentedPage($page);
+
+        $expectations = [
+            'title' => ['type' => Value::class, 'value' => 'The Page Title'],
+            'url' => ['type' => 'string', 'value' => '/the-url'],
+            'uri' => ['type' => 'string', 'value' => '/the-uri'],
+            'permalink' => ['type' => 'string', 'value' => 'https://site.com/the-permalink'],
+            'one' => ['type' => Value::class, 'value' => 'dos', 'fieldtype' => 'textarea'], // assert fieldtype to ensure the field from the page blueprint wins
+            'three' => ['type' => Value::class, 'value' => 'quatro'],
+            'five' => ['type' => 'string', 'value' => 'seis'],
+            'id' => ['type' => 'string', 'value' => 'page-id'],
+            'entry_id' => ['type' => 'string', 'value' => '123'],
+        ];
+
+        $this->assertSubsetAugmentedCorrectly($expectations, $augmented);
+    }
+}
diff --git a/tests/Data/Structures/BranchIdsTest.php b/tests/Data/Structures/BranchIdsTest.php
new file mode 100644
index 00000000000..6cd820b936a
--- /dev/null
+++ b/tests/Data/Structures/BranchIdsTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Tests\Data\Structures;
+
+use Facades\Statamic\Structures\BranchIdGenerator;
+use Statamic\Structures\BranchIds;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class BranchIdsTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_adds_ids_to_branches()
+    {
+        $tree = [
+            ['title' => 'First'],
+            ['title' => 'Second', 'children' => [
+                ['id' => 'existing-id', 'title' => 'Child 1'],
+                ['title' => 'Child 2', 'children' => [
+                    ['title' => 'Grandchild 1'],
+                    ['id' => 'another-existing-id', 'entry' => 'a'],
+                    ['title' => 'Grandchild 3'],
+                ]],
+                ['entry' => 'b'],
+                ['title' => 'Child 4'],
+            ]],
+        ];
+
+        BranchIdGenerator::shouldReceive('generate')->times(7)->andReturn(
+            'id1', 'id2', 'id3', 'id4', 'id5', 'id6', 'id7'
+        );
+
+        $ensured = (new BranchIds)->ensure($tree);
+
+        $this->assertSame([
+            ['id' => 'id1', 'title' => 'First'],
+            ['id' => 'id2', 'title' => 'Second', 'children' => [
+                ['id' => 'existing-id', 'title' => 'Child 1'],
+                ['id' => 'id3', 'title' => 'Child 2', 'children' => [
+                    ['id' => 'id4', 'title' => 'Grandchild 1'],
+                    ['id' => 'another-existing-id', 'entry' => 'a'],
+                    ['id' => 'id5', 'title' => 'Grandchild 3'],
+                ]],
+                ['id' => 'id6', 'entry' => 'b'],
+                ['id' => 'id7', 'title' => 'Child 4'],
+            ]],
+        ], $ensured);
+    }
+}
diff --git a/tests/Data/Structures/CollectionStructureTest.php b/tests/Data/Structures/CollectionStructureTest.php
index 533a1211154..ddadac2feae 100644
--- a/tests/Data/Structures/CollectionStructureTest.php
+++ b/tests/Data/Structures/CollectionStructureTest.php
@@ -344,18 +344,4 @@ public function it_saves_through_the_collection()
 
         $this->assertTrue($structure->save());
     }
-
-    /** @test **/
-    public function the_root_doesnt_need_to_be_an_entry_if_the_tree_is_empty()
-    {
-        Facades\Collection::shouldReceive('findByHandle')->with('test')->andReturn($this->collection);
-        parent::the_root_doesnt_need_to_be_an_entry_if_the_tree_is_empty();
-    }
-
-    /** @test **/
-    public function the_root_doesnt_need_to_be_an_entry_when_not_expecting_root()
-    {
-        Facades\Collection::shouldReceive('findByHandle')->with('test')->andReturn($this->collection);
-        parent::the_root_doesnt_need_to_be_an_entry_when_not_expecting_root();
-    }
 }
diff --git a/tests/Data/Structures/NavTreeTest.php b/tests/Data/Structures/NavTreeTest.php
index c9dd06275e6..560cb193850 100644
--- a/tests/Data/Structures/NavTreeTest.php
+++ b/tests/Data/Structures/NavTreeTest.php
@@ -2,9 +2,12 @@
 
 namespace Tests\Data\Structures;
 
+use Facades\Statamic\Structures\BranchIds;
 use Statamic\Facades\Blink;
+use Statamic\Facades\File;
 use Statamic\Facades\Nav;
 use Statamic\Facades\Site;
+use Statamic\Facades\YAML;
 use Statamic\Structures\NavTree;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -15,12 +18,14 @@ class NavTreeTest extends TestCase
     use PreventSavingStacheItemsToDisk;
     use UnlinksPaths;
 
+    private $directory;
+
     public function setUp(): void
     {
         parent::setUp();
 
         $stache = $this->app->make('stache');
-        $stache->store('nav-trees')->directory($this->directory = '/path/to/structures/navigation');
+        $stache->store('nav-trees')->directory($this->directory = $this->fakeStacheDirectory.$this->directory.'');
     }
 
     /** @test */
@@ -55,7 +60,7 @@ public function it_gets_the_structure()
     public function it_gets_the_path()
     {
         $tree = Nav::make('links')->makeTree('en');
-        $this->assertEquals('/path/to/structures/navigation/links.yaml', $tree->path());
+        $this->assertEquals($this->directory.'/links.yaml', $tree->path());
     }
 
     /** @test */
@@ -66,6 +71,46 @@ public function it_gets_the_path_when_using_multisite()
             'two' => ['locale' => 'fr_Fr', 'url' => '/two'],
         ]]);
         $tree = Nav::make('links')->makeTree('en');
-        $this->assertEquals('/path/to/structures/navigation/en/links.yaml', $tree->path());
+        $this->assertEquals($this->directory.'/en/links.yaml', $tree->path());
+    }
+
+    /** @test */
+    public function it_can_ensure_ids_have_been_generated()
+    {
+        BranchIds::shouldReceive('ensure')
+            ->with($existingTree = [['title' => 'Branch']])
+            ->andReturn($updatedTree = [['id' => 'the-id', 'title' => 'Branch']])
+            ->once();
+
+        $nav = tap(Nav::make('links'))->save();
+        $tree = tap($nav->makeTree('en', $existingTree))->save();
+
+        $this->assertEquals(['tree' => $existingTree], YAML::file($tree->path())->parse());
+
+        $return = $tree->ensureBranchIds();
+
+        $this->assertEquals($tree, $return);
+        $this->assertEquals($updatedTree, $tree->tree());
+        $this->assertEquals(['tree' => $updatedTree], YAML::file($tree->path())->parse());
+    }
+
+    /** @test */
+    public function it_doesnt_save_tree_when_ensuring_ids_if_nothing_changed()
+    {
+        BranchIds::shouldReceive('ensure')
+            ->with($existingTree = [['id' => 'the-id', 'title' => 'Branch']])
+            ->andReturn($existingTree)
+            ->once();
+
+        $nav = tap(Nav::make('links'))->save();
+        $tree = tap($nav->makeTree('en', $existingTree))->save();
+
+        File::put($tree->path(), $existingFileContents = 'different contents to show that it doesnt re-save');
+
+        $return = $tree->ensureBranchIds();
+
+        $this->assertEquals($tree, $return);
+        $this->assertEquals($existingTree, $tree->tree());
+        $this->assertEquals($existingFileContents, File::get($tree->path()));
     }
 }
diff --git a/tests/Data/Structures/PageTest.php b/tests/Data/Structures/PageTest.php
index 686ec68a3d8..72af5bdaebd 100644
--- a/tests/Data/Structures/PageTest.php
+++ b/tests/Data/Structures/PageTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Data\Structures;
 
+use Facades\Tests\Factories\EntryFactory;
 use Illuminate\Support\Collection;
 use Mockery;
 use Statamic\Contracts\Structures\Nav;
@@ -68,6 +69,58 @@ public function it_gets_the_entry_dynamically_when_its_set_using_an_int()
         $this->assertEquals($page, $return);
     }
 
+    /** @test */
+    public function it_gets_the_title()
+    {
+        $page = new Page;
+
+        $this->assertNull($page->title());
+        $this->assertFalse($page->hasCustomTitle());
+
+        $page->setTitle('Test');
+
+        $this->assertEquals('Test', $page->title());
+        $this->assertTrue($page->hasCustomTitle());
+    }
+
+    /** @test */
+    public function it_gets_the_title_when_referencing_an_entry()
+    {
+        $entry = $this->mock(Entry::class);
+        $entry->shouldReceive('id')->andReturn('test');
+        $entry->shouldReceive('value')->andReturn('Entry Title');
+
+        $page = new Page;
+
+        $this->assertNull($page->title());
+        $this->assertFalse($page->hasCustomTitle());
+
+        $page->setEntry($entry);
+
+        $this->assertEquals('Entry Title', $page->title());
+        $this->assertFalse($page->hasCustomTitle());
+    }
+
+    /** @test */
+    public function it_gets_the_custom_title_when_referencing_an_entry()
+    {
+        $entry = $this->mock(Entry::class);
+        $entry->shouldReceive('id')->andReturn('test');
+        $entry->shouldReceive('value')->andReturn('Entry Title');
+
+        $page = new Page;
+
+        $this->assertNull($page->title());
+        $this->assertFalse($page->hasCustomTitle());
+
+        $page
+            ->setEntry($entry)
+            ->setTitle('Custom Title');
+
+        $this->assertEquals('Custom Title', $page->title());
+        $this->assertTrue($page->hasCustomTitle());
+    }
+
     /** @test */
     public function it_gets_and_sets_the_parent()
     {
@@ -128,6 +181,7 @@ public function slug($slug = null)
             ->setEntry($entry);
 
         $this->assertEquals('/foo/the/parent/uri/bar/entry-slug', $page->uri());
+        $this->assertFalse($page->hasCustomUrl());
     }
 
     /** @test */
@@ -153,6 +207,7 @@ public function it_gets_the_entrys_uri_when_the_structure_does_not_have_a_collec
         $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrl());
         $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
         $this->assertFalse($page->isRedirect());
+        $this->assertFalse($page->hasCustomUrl());
     }
 
     /** @test */
@@ -178,6 +233,7 @@ public function it_gets_the_uri_of_a_redirect_entry()
         $this->assertEquals('http://example.com/page', $page->absoluteUrl());
         $this->assertEquals('http://localhost/the/actual/entry/uri', $page->absoluteUrlWithoutRedirect());
         $this->assertTrue($page->isRedirect());
+        $this->assertFalse($page->hasCustomUrl());
     }
 
     /** @test */
@@ -197,6 +253,7 @@ public function it_gets_the_uri_of_a_hardcoded_relative_link()
         $this->assertEquals('http://localhost/blog', $page->absoluteUrl());
         $this->assertEquals('http://localhost/blog', $page->absoluteUrlWithoutRedirect());
         $this->assertFalse($page->isRedirect());
+        $this->assertTrue($page->hasCustomUrl());
     }
 
     /** @test */
@@ -216,6 +273,7 @@ public function it_gets_the_uri_of_a_hardcoded_absolute_link()
         $this->assertEquals('https://google.com', $page->absoluteUrl());
         $this->assertEquals('https://google.com', $page->absoluteUrlWithoutRedirect());
         $this->assertFalse($page->isRedirect());
+        $this->assertTrue($page->hasCustomUrl());
     }
 
     /** @test */
@@ -235,6 +293,7 @@ public function it_gets_the_uri_of_a_hardcoded_text_only_page()
         $this->assertNull($page->absoluteUrl());
         $this->assertNull($page->absoluteUrlWithoutRedirect());
         $this->assertFalse($page->isRedirect());
+        $this->assertFalse($page->hasCustomUrl());
     }
 
     /** @test */
@@ -247,9 +306,9 @@ public function it_gets_child_pages()
             ->setEntry((new Entry)->id('123'))
             ->setRoute('')
             ->setChildren([
-                ['entry' => 'one'],
-                ['entry' => 'two', 'children' => [
-                    ['entry' => 'three'],
+                ['id' => 'one'],
+                ['id' => 'two', 'children' => [
+                    ['id' => 'three'],
                 ]],
             ]);
 
@@ -257,84 +316,19 @@ public function it_gets_child_pages()
         $this->assertInstanceOf(Pages::class, $pages);
         $this->assertCount(2, $pages->all());
         $this->assertEveryItemIsInstanceOf(Page::class, $pages->all());
-        $this->assertEquals(['one', 'two'], $pages->all()->map->reference()->all());
+        $this->assertEquals(['one', 'two'], $pages->all()->map->id()->all());
     }
 
     /** @test */
     public function it_gets_flattened_pages()
     {
-        EntryAPI::shouldReceive('find')->with('one')
-            ->andReturn(new class extends Entry
-            {
-                public function id($slug = null)
-                {
-                    return 'one';
-                }
-
-                public function slug($slug = null)
-                {
-                    return 'one';
-                }
-            });
-
-        EntryAPI::shouldReceive('find')->with('two')
-            ->andReturn(new class extends Entry
-            {
-                public function id($slug = null)
-                {
-                    return 'two';
-                }
-
-                public function slug($slug = null)
-                {
-                    return 'two';
-                }
-            });
-
-        EntryAPI::shouldReceive('find')->with('three')
-            ->andReturn(new class extends Entry
-            {
-                public function id($slug = null)
-                {
-                    return 'three';
-                }
-
-                public function slug($slug = null)
-                {
-                    return 'three';
-                }
-            });
-
-        EntryAPI::shouldReceive('find')->with('four')
-            ->andReturn(new class extends Entry
-            {
-                public function id($slug = null)
-                {
-                    return 'four';
-                }
-
-                public function slug($slug = null)
-                {
-                    return 'four';
-                }
-            });
-
-        $entry = Mockery::mock(Page::class);
-        $entry->shouldReceive('id')->andReturn('root');
-        $entry->shouldReceive('slug')->andReturn('');
-
-        $tree = $this->newTree()->setStructure(
-            $this->mock(Structure::class)->shouldReceive('collection')->andReturnFalse()->getMock()
-        );
-
         $page = (new Page)
-            ->setTree($tree)
-            ->setEntry($entry)
+            ->setTree($this->newTree())
             ->setChildren([
-                ['entry' => 'one'],
-                ['entry' => 'two', 'children' => [
-                    ['entry' => 'three', 'children' => [
-                        ['entry' => 'four'],
+                ['id' => 'one'],
+                ['id' => 'two', 'children' => [
+                    ['id' => 'three', 'children' => [
+                        ['id' => 'four'],
                     ]],
                 ]],
             ]);
@@ -343,7 +337,7 @@ public function slug($slug = null)
         $this->assertInstanceOf(Collection::class, $flattened);
         $this->assertCount(4, $flattened);
         $this->assertEveryItemIsInstanceOf(Page::class, $flattened);
-        $this->assertEquals(['one', 'two', 'three', 'four'], $flattened->map->reference()->all());
+        $this->assertEquals(['one', 'two', 'three', 'four'], $flattened->map->id()->all());
     }
 
     /** @test */
@@ -359,6 +353,87 @@ public function it_forwards_calls_to_the_entry()
         $this->assertEquals('hello', $page->testing('123'));
     }
 
+    /** @test */
+    public function it_gets_values()
+    {
+        $page = new Page;
+
+        $this->assertInstanceOf(Collection::class, $page->data());
+        $this->assertEquals([], $page->data()->all());
+        $this->assertInstanceOf(Collection::class, $page->pageData());
+        $this->assertEquals([], $page->pageData()->all());
+        $this->assertInstanceOf(Collection::class, $page->values());
+        $this->assertEquals([], $page->values()->all());
+        $this->assertNull($page->value('foo'));
+        $this->assertNull($page->get('foo'));
+        $this->assertEquals('fallback', $page->get('unknown', 'fallback'));
+
+        $page->setPageData(['foo' => 'bar']);
+
+        $this->assertInstanceOf(Collection::class, $page->data());
+        $this->assertEquals(['foo' => 'bar'], $page->data()->all());
+        $this->assertInstanceOf(Collection::class, $page->pageData());
+        $this->assertEquals(['foo' => 'bar'], $page->pageData()->all());
+        $this->assertInstanceOf(Collection::class, $page->values());
+        $this->assertEquals(['foo' => 'bar'], $page->values()->all());
+        $this->assertEquals('bar', $page->value('foo'));
+        $this->assertEquals('bar', $page->get('foo'));
+        $this->assertEquals('fallback', $page->get('unknown', 'fallback'));
+    }
+
+    /** @test */
+    public function it_gets_values_and_falls_back_to_values_from_the_entry()
+    {
+        $entry = EntryFactory::id('test-entry')->collection('test')->data([
+            'foo' => 'entry bar',
+            'baz' => 'entry qux',
+        ])->create();
+
+        $tree = $this->mock(Tree::class)->shouldReceive('entry')->with('test-entry')->andReturn($entry)->getMock();
+
+        $page = new Page;
+        $page->setEntry('test-entry');
+        $page->setTree($tree);
+
+        $this->assertInstanceOf(Collection::class, $page->data());
+        $this->assertEquals([
+            'foo' => 'entry bar',
+            'baz' => 'entry qux',
+        ], $page->data()->all());
+        $this->assertInstanceOf(Collection::class, $page->pageData());
+        $this->assertEquals([], $page->pageData()->all());
+        $this->assertInstanceOf(Collection::class, $page->values());
+        $this->assertEquals([
+            'foo' => 'entry bar',
+            'baz' => 'entry qux',
+        ], $page->values()->all());
+        $this->assertEquals('entry bar', $page->value('foo'));
+        $this->assertEquals('entry bar', $page->get('foo'));
+        $this->assertEquals('entry qux', $page->value('baz'));
+        $this->assertEquals('entry qux', $page->get('baz'));
+        $this->assertEquals('fallback', $page->get('unknown', 'fallback'));
+
+        $page->setPageData(['foo' => 'page bar']);
+
+        $this->assertInstanceOf(Collection::class, $page->data());
+        $this->assertEquals([
+            'foo' => 'page bar',
+            'baz' => 'entry qux',
+        ], $page->data()->all());
+        $this->assertInstanceOf(Collection::class, $page->pageData());
+        $this->assertEquals(['foo' => 'page bar'], $page->pageData()->all());
+        $this->assertInstanceOf(Collection::class, $page->values());
+        $this->assertEquals([
+            'foo' => 'page bar',
+            'baz' => 'entry qux',
+        ], $page->values()->all());
+        $this->assertEquals('page bar', $page->value('foo'));
+        $this->assertEquals('page bar', $page->get('foo'));
+        $this->assertEquals('entry qux', $page->value('baz'));
+        $this->assertEquals('entry qux', $page->get('baz'));
+        $this->assertEquals('fallback', $page->get('unknown', 'fallback'));
+    }
+
     protected function newTree()
     {
         return new class extends Tree
diff --git a/tests/Data/Structures/PagesTest.php b/tests/Data/Structures/PagesTest.php
index f0ef29bc7f5..4e697c43da4 100644
--- a/tests/Data/Structures/PagesTest.php
+++ b/tests/Data/Structures/PagesTest.php
@@ -25,49 +25,48 @@ public function setUp(): void
     public function it_gets_a_list_of_pages()
     {
         $parent = Mockery::mock(Page::class);
-        $parent->shouldReceive('reference')->andReturn('the-root');
-        $parent->shouldReceive('flattenedPages')->andReturn(collect());
-        $parent->shouldReceive('uri')->andReturn('/root');
+        $parent->shouldReceive('id')->andReturn('the-root');
 
         $pages = (new Pages)
+            ->setTree($this->newTree())
             ->setParent($parent)
             ->setPages([
-                ['entry' => 'one', 'children' => [
-                    ['entry' => 'one-one'],
-                    ['entry' => 'one-two', 'children' => [
-                        ['entry' => 'one-two-one'],
+                ['id' => 'one', 'data' => ['foo' => 'bar'], 'children' => [
+                    ['id' => 'one-one'],
+                    ['id' => 'one-two', 'children' => [
+                        ['id' => 'one-two-one'],
                     ]],
                 ]],
-                ['entry' => 'two'],
+                ['id' => 'two'],
             ]);
 
         $list = $pages->all();
         $this->assertInstanceOf(Collection::class, $list);
         $this->assertCount(3, $list);
         $this->assertEveryItemIsInstanceOf(Page::class, $list);
-        $this->assertEquals(['the-root', 'one', 'two'], $list->map->reference()->all());
+        $this->assertEquals(['the-root', 'one', 'two'], $list->map->id()->all());
+        $this->assertEquals(['foo' => 'bar'], $list[1]->pageData()->all());
     }
 
     /** @test */
     public function it_gets_flattened_pages()
     {
         $parent = Mockery::mock(Page::class);
-        $parent->shouldReceive('reference')->andReturn('the-root');
         $parent->shouldReceive('flattenedPages')->andReturn(collect());
-        $parent->shouldReceive('uri')->andReturn('/root');
+        $parent->shouldReceive('id')->andReturn('the-root');
 
         $pages = (new Pages)
             ->setTree($this->newTree())
             ->setParent($parent)
             ->setRoute('{parent_uri}/{slug}')
             ->setPages([
-                ['entry' => 'one', 'children' => [
-                    ['entry' => 'one-one'],
-                    ['entry' => 'one-two', 'children' => [
-                        ['entry' => 'one-two-one'],
+                ['id' => 'one', 'children' => [
+                    ['id' => 'one-one'],
+                    ['id' => 'one-two', 'children' => [
+                        ['id' => 'one-two-one'],
                     ]],
                 ]],
-                ['entry' => 'two'],
+                ['id' => 'two'],
             ]);
 
         $this->assertEquals([
@@ -77,7 +76,7 @@ public function it_gets_flattened_pages()
             'one-two',
             'one-two-one',
             'two',
-        ], $pages->flattenedPages()->map->reference()->all());
+        ], $pages->flattenedPages()->map->id()->all());
     }
 
     protected function newTree()
diff --git a/tests/Data/Structures/StructureTestCase.php b/tests/Data/Structures/StructureTestCase.php
index e8739b62d9c..adffa86148c 100644
--- a/tests/Data/Structures/StructureTestCase.php
+++ b/tests/Data/Structures/StructureTestCase.php
@@ -42,37 +42,4 @@ public function the_tree_root_can_have_children_when_not_expecting_root()
 
         $this->assertEquals($tree, $this->structure('test')->expectsRoot(false)->validateTree($tree, 'en'));
     }
-
-    /** @test */
-    public function the_root_must_be_an_entry_when_expecting_root()
-    {
-        $this->expectException(\Exception::class);
-        $this->expectExceptionMessage('Root page must be an entry');
-
-        $this->structure('test')->expectsRoot(true)->validateTree([
-            [
-                'title' => 'Not an entry',
-                'url' => '/test',
-            ],
-        ], 'en');
-    }
-
-    /** @test */
-    public function the_root_doesnt_need_to_be_an_entry_if_the_tree_is_empty()
-    {
-        $this->assertEquals([], $this->structure('test')->expectsRoot(true)->validateTree([], 'en'));
-    }
-
-    /** @test **/
-    public function the_root_doesnt_need_to_be_an_entry_when_not_expecting_root()
-    {
-        $tree = [
-            [
-                'title' => 'Not an entry',
-                'url' => '/test',
-            ],
-        ];
-
-        $this->assertEquals($tree, $this->structure('test')->expectsRoot(false)->validateTree($tree, 'en'));
-    }
 }
diff --git a/tests/Data/Structures/TreeTest.php b/tests/Data/Structures/TreeTest.php
index 10bac7434f2..8081e5218be 100644
--- a/tests/Data/Structures/TreeTest.php
+++ b/tests/Data/Structures/TreeTest.php
@@ -107,9 +107,9 @@ public function it_gets_the_root()
     {
         $tree = $this->tree();
         $tree->structure()->expectsRoot(true);
-        $tree->tree([['entry' => 'pages-home']]);
+        $tree->tree([$root = ['id' => 'pages-home']]);
 
-        $this->assertEquals('pages-home', $tree->root());
+        $this->assertEquals($root, $tree->root());
     }
 
     /** @test */
@@ -142,11 +142,11 @@ public function it_gets_the_child_pages_including_the_root()
     }
 
     /** @test */
-    public function it_gets_a_page_by_key()
+    public function it_gets_a_page_by_id()
     {
         $page = $this->tree()->page('pages-directors');
 
-        $this->assertEquals('Directors', $page->title());
+        $this->assertEquals('Custom Directors Title', $page->title());
     }
 
     /** @test */
@@ -158,23 +158,25 @@ public function it_appends_an_entry()
 
         $this->assertEquals([
             [
+                'id' => 'root-id',
                 'entry' => 'pages-home',
             ],
             [
-                'entry' => 'pages-about',
+                'id' => 'pages-about',
                 'children' => [
                     [
-                        'entry' => 'pages-board',
+                        'id' => 'pages-board',
                         'children' => [
                             [
-                                'entry' => 'pages-directors',
+                                'id' => 'pages-directors',
+                                'title' => 'Custom Directors Title',
                             ],
                         ],
                     ],
                 ],
             ],
             [
-                'entry' => 'pages-blog',
+                'id' => 'pages-blog',
             ],
             [
                 'entry' => 'appended-page',
@@ -191,26 +193,28 @@ public function it_appends_an_entry_to_another_page()
 
         $this->assertEquals([
             [
+                'id' => 'root-id',
                 'entry' => 'pages-home',
             ],
             [
-                'entry' => 'pages-about',
+                'id' => 'pages-about',
                 'children' => [
                     [
-                        'entry' => 'pages-board',
+                        'id' => 'pages-board',
                         'children' => [
                             [
-                                'entry' => 'pages-directors',
+                                'id' => 'pages-directors',
+                                'title' => 'Custom Directors Title',
                             ],
                             [
-                                'entry' => 'appended-page',
+                                'id' => 'appended-page',
                             ],
                         ],
                     ],
                 ],
             ],
             [
-                'entry' => 'pages-blog',
+                'id' => 'pages-blog',
             ],
         ], $tree->tree());
     }
@@ -229,22 +233,24 @@ public function it_moves_an_entry_to_another_page()
 
         $this->assertEquals([
             [
+                'id' => 'root-id',
                 'entry' => 'pages-home',
             ],
             [
-                'entry' => 'pages-about',
+                'id' => 'pages-about',
                 'children' => [
                     [
-                        'entry' => 'pages-board',
+                        'id' => 'pages-board',
                     ],
                     [
-                        'entry' => 'pages-directors',
+                        'id' => 'pages-directors',
                         'foo' => 'bar',
+                        'title' => 'Custom Directors Title',
                     ],
                 ],
             ],
             [
-                'entry' => 'pages-blog',
+                'id' => 'pages-blog',
             ],
         ], $tree->tree());
     }
@@ -254,21 +260,21 @@ public function it_doesnt_get_moved_if_its_already_in_the_target()
     {
         $tree = $this->tree($arr = [
             [
-                'entry' => 'pages-home',
+                'id' => 'pages-home',
             ],
             [
-                'entry' => 'pages-about',
+                'id' => 'pages-about',
                 'children' => [
                     [
-                        'entry' => 'pages-board',
+                        'id' => 'pages-board',
                     ],
                     [
-                        'entry' => 'pages-directors',
+                        'id' => 'pages-directors',
                     ],
                 ],
             ],
             [
-                'entry' => 'pages-blog',
+                'id' => 'pages-blog',
             ],
         ]);
 
@@ -285,21 +291,21 @@ public function it_doesnt_get_moved_to_root_if_its_already_there_and_the_target_
     {
         $tree = $this->tree()->tree($arr = [
             [
-                'entry' => 'pages-home',
+                'id' => 'pages-home',
             ],
             [
-                'entry' => 'pages-about',
+                'id' => 'pages-about',
                 'children' => [
                     [
-                        'entry' => 'pages-board',
+                        'id' => 'pages-board',
                     ],
                     [
-                        'entry' => 'pages-directors',
+                        'id' => 'pages-directors',
                     ],
                 ],
             ],
             [
-                'entry' => 'pages-blog',
+                'id' => 'pages-blog',
             ],
         ]);
 
@@ -316,19 +322,19 @@ public function it_can_move_the_root()
     {
         $tree = $this->tree([
             [
-                'entry' => 'pages-home',
+                'id' => 'pages-home',
             ],
             [
-                'entry' => 'pages-blog',
+                'id' => 'pages-blog',
             ],
             [
-                'entry' => 'pages-about',
+                'id' => 'pages-about',
                 'children' => [
                     [
-                        'entry' => 'pages-board',
+                        'id' => 'pages-board',
                         'children' => [
                             [
-                                'entry' => 'pages-directors',
+                                'id' => 'pages-directors',
                             ],
                         ],
                     ],
@@ -340,19 +346,19 @@ public function it_can_move_the_root()
 
         $this->assertEquals([
             [
-                'entry' => 'pages-blog',
+                'id' => 'pages-blog',
             ],
             [
-                'entry' => 'pages-about',
+                'id' => 'pages-about',
                 'children' => [
                     [
-                        'entry' => 'pages-board',
+                        'id' => 'pages-board',
                         'children' => [
                             [
-                                'entry' => 'pages-directors',
+                                'id' => 'pages-directors',
                             ],
                             [
-                                'entry' => 'pages-home',
+                                'id' => 'pages-home',
                             ],
                         ],
                     ],
@@ -366,16 +372,16 @@ public function it_fixes_indexes_when_moving()
     {
         $tree = $this->tree([
             [
-                'entry' => 'pages-home',
+                'id' => 'pages-home',
             ],
             [
-                'entry' => 'pages-blog',
+                'id' => 'pages-blog',
             ],
             [
-                'entry' => 'pages-about',
+                'id' => 'pages-about',
                 'children' => [
                     [
-                        'entry' => 'pages-board',
+                        'id' => 'pages-board',
                     ],
                 ],
             ],
@@ -386,16 +392,16 @@ public function it_fixes_indexes_when_moving()
         // If the indexes hadn't been fixed, we'd have an array starting with 1.
         $this->assertEquals([
             [
-                'entry' => 'pages-home',
+                'id' => 'pages-home',
             ],
             [
-                'entry' => 'pages-about',
+                'id' => 'pages-about',
                 'children' => [
                     [
-                        'entry' => 'pages-board',
+                        'id' => 'pages-board',
                     ],
                     [
-                        'entry' => 'pages-blog',
+                        'id' => 'pages-blog',
                     ],
                 ],
             ],
@@ -440,21 +446,21 @@ public function it_cannot_move_into_root_if_structure_expects_root()
 
         $tree = $this->tree()->tree([
             [
-                'entry' => 'pages-home',
+                'id' => 'pages-home',
             ],
             [
-                'entry' => 'pages-about',
+                'id' => 'pages-about',
                 'children' => [
                     [
-                        'entry' => 'pages-board',
+                        'id' => 'pages-board',
                     ],
                     [
-                        'entry' => 'pages-directors',
+                        'id' => 'pages-directors',
                     ],
                 ],
             ],
             [
-                'entry' => 'pages-blog',
+                'id' => 'pages-blog',
             ],
         ]);
 
@@ -469,21 +475,21 @@ public function it_can_move_into_root_if_structure_does_not_expect_root()
 
         $tree->tree([
             [
-                'entry' => 'pages-home',
+                'id' => 'pages-home',
             ],
             [
-                'entry' => 'pages-about',
+                'id' => 'pages-about',
                 'children' => [
                     [
-                        'entry' => 'pages-board',
+                        'id' => 'pages-board',
                     ],
                     [
-                        'entry' => 'pages-directors',
+                        'id' => 'pages-directors',
                     ],
                 ],
             ],
             [
-                'entry' => 'pages-blog',
+                'id' => 'pages-blog',
             ],
         ]);
 
@@ -491,23 +497,23 @@ public function it_can_move_into_root_if_structure_does_not_expect_root()
 
         $this->assertEquals([
             [
-                'entry' => 'pages-home',
+                'id' => 'pages-home',
                 'children' => [
                     [
-                        'entry' => 'pages-board',
+                        'id' => 'pages-board',
                     ],
                 ],
             ],
             [
-                'entry' => 'pages-about',
+                'id' => 'pages-about',
                 'children' => [
                     [
-                        'entry' => 'pages-directors',
+                        'id' => 'pages-directors',
                     ],
                 ],
             ],
             [
-                'entry' => 'pages-blog',
+                'id' => 'pages-blog',
             ],
         ], $tree->tree());
     }
@@ -519,23 +525,25 @@ protected function tree($tree = null)
             ->setStructure((new Nav)->expectsRoot(true))
             ->tree($tree ?? [
                 [
+                    'id' => 'root-id',
                     'entry' => 'pages-home',
                 ],
                 [
-                    'entry' => 'pages-about',
+                    'id' => 'pages-about',
                     'children' => [
                         [
-                            'entry' => 'pages-board',
+                            'id' => 'pages-board',
                             'children' => [
                                 [
-                                    'entry' => 'pages-directors',
+                                    'id' => 'pages-directors',
+                                    'title' => 'Custom Directors Title',
                                 ],
                             ],
                         ],
                     ],
                 ],
                 [
-                    'entry' => 'pages-blog',
+                    'id' => 'pages-blog',
                 ],
             ])
             ->syncOriginal();
diff --git a/tests/Feature/Collections/UpdateCollectionStructureTest.php b/tests/Feature/Collections/UpdateCollectionTreeTest.php
similarity index 97%
rename from tests/Feature/Collections/UpdateCollectionStructureTest.php
rename to tests/Feature/Collections/UpdateCollectionTreeTest.php
index 799037f9507..d23fe2b0765 100644
--- a/tests/Feature/Collections/UpdateCollectionStructureTest.php
+++ b/tests/Feature/Collections/UpdateCollectionTreeTest.php
@@ -10,7 +10,7 @@
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
 
-class UpdateCollectionStructureTest extends TestCase
+class UpdateCollectionTreeTest extends TestCase
 {
     use PreventSavingStacheItemsToDisk;
     use FakesRoles;
@@ -194,8 +194,8 @@ public function update($collection, $payload = [])
             'deletedEntries' => [],
         ];
 
-        return $this->postJson(
-            cp_route('collections.structure.update', $collection->handle()),
+        return $this->patchJson(
+            cp_route('collections.tree.update', $collection->handle()),
             array_merge($validParams, $payload)
         );
     }
diff --git a/tests/Feature/GraphQL/CollectionTest.php b/tests/Feature/GraphQL/CollectionTest.php
index ae74869f2a4..184ce4ea635 100644
--- a/tests/Feature/GraphQL/CollectionTest.php
+++ b/tests/Feature/GraphQL/CollectionTest.php
@@ -2,7 +2,9 @@
 
 namespace Tests\Feature\GraphQL;
 
+use Facades\Statamic\Fields\BlueprintRepository;
 use Facades\Tests\Factories\EntryFactory;
+use Statamic\Facades\Blueprint;
 use Statamic\Facades\Collection;
 use Statamic\Facades\Site;
 use Statamic\Structures\CollectionStructure;
@@ -67,12 +69,16 @@ public function it_queries_the_structure_and_its_tree()
             ],
         ]);
 
+        BlueprintRepository::partialMock();
+        $blueprint = Blueprint::makeFromFields(['foo' => ['type' => 'text']])->setHandle('pages');
+        BlueprintRepository::shouldReceive('in')->with('collections/pages')->andReturn(collect(['pages' => $blueprint]));
+
         $collection = Collection::make('pages')->title('Pages')->routes('{parent_uri}/{slug}')->sites(['en', 'fr']);
         $structure = (new CollectionStructure)->maxDepth(3)->expectsRoot(true);
         $collection->structure($structure)->save();
 
-        EntryFactory::collection('pages')->id('home')->slug('home')->data(['title' => 'Home'])->create();
-        EntryFactory::collection('pages')->id('about')->slug('about')->data(['title' => 'About'])->create();
+        EntryFactory::collection('pages')->id('home')->slug('home')->data(['title' => 'Home', 'foo' => 'bar'])->create();
+        EntryFactory::collection('pages')->id('about')->slug('about')->data(['title' => 'About', 'foo' => 'baz'])->create();
         EntryFactory::collection('pages')->id('team')->slug('team')->data(['title' => 'Team'])->create();
 
         EntryFactory::collection('pages')->locale('fr')->id('fr-home')->slug('fr-home')->data(['title' => 'Fr Home'])->create();
@@ -101,33 +107,45 @@ public function it_queries_the_structure_and_its_tree()
             expects_root
             englishTree: tree {
                 depth
-                page {
+                entry {
                     id
                     title
                     url
+                    ... on Entry_Pages_Pages {
+                        foo
+                    }
                 }
                 children {
                     depth
-                    page {
+                    entry {
                         id
                         title
                         url
+                        ... on Entry_Pages_Pages {
+                            foo
+                        }
                     }
                 }
             }
             frenchTree: tree(site: "fr") {
                 depth
-                page {
+                entry {
                     id
                     title
                     url
+                    ... on Entry_Pages_Pages {
+                        foo
+                    }
                 }
                 children {
                     depth
-                    page {
+                    entry {
                         id
                         title
                         url
+                        ... on Entry_Pages_Pages {
+                            foo
+                        }
                     }
                 }
             }
@@ -148,27 +166,30 @@ public function it_queries_the_structure_and_its_tree()
                         'englishTree' => [
                             [
                                 'depth' => 1,
-                                'page' => [
+                                'entry' => [
                                     'id' => 'home',
                                     'title' => 'Home',
                                     'url' => '/',
+                                    'foo' => 'bar',
                                 ],
                                 'children' => [],
                             ],
                             [
                                 'depth' => 1,
-                                'page' => [
+                                'entry' => [
                                     'id' => 'about',
                                     'title' => 'About',
                                     'url' => '/about',
+                                    'foo' => 'baz',
                                 ],
                                 'children' => [
                                     [
                                         'depth' => 2,
-                                        'page' => [
+                                        'entry' => [
                                             'id' => 'team',
                                             'title' => 'Team',
                                             'url' => '/about/team',
+                                            'foo' => null,
                                         ],
                                     ],
                                 ],
@@ -177,27 +198,30 @@ public function it_queries_the_structure_and_its_tree()
                         'frenchTree' => [
                             [
                                 'depth' => 1,
-                                'page' => [
+                                'entry' => [
                                     'id' => 'fr-home',
                                     'title' => 'Fr Home',
                                     'url' => '/fr',
+                                    'foo' => null,
                                 ],
                                 'children' => [],
                             ],
                             [
                                 'depth' => 1,
-                                'page' => [
+                                'entry' => [
                                     'id' => 'fr-about',
                                     'title' => 'Fr About',
                                     'url' => '/fr/fr-about',
+                                    'foo' => null,
                                 ],
                                 'children' => [
                                     [
                                         'depth' => 2,
-                                        'page' => [
+                                        'entry' => [
                                             'id' => 'fr-team',
                                             'title' => 'Fr Team',
                                             'url' => '/fr/fr-about/fr-team',
+                                            'foo' => null,
                                         ],
                                     ],
                                 ],
diff --git a/tests/Feature/GraphQL/NavTest.php b/tests/Feature/GraphQL/NavTest.php
index 4c9b4de1611..20ca8d6f531 100644
--- a/tests/Feature/GraphQL/NavTest.php
+++ b/tests/Feature/GraphQL/NavTest.php
@@ -3,6 +3,9 @@
 namespace Tests\Feature\GraphQL;
 
 use Facades\Statamic\Fields\BlueprintRepository;
+use Facades\Tests\Factories\EntryFactory;
+use Statamic\Facades\Blueprint;
+use Statamic\Facades\Collection;
 use Statamic\Facades\Nav;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -16,12 +19,6 @@ class NavTest extends TestCase
 
     protected $enabledQueries = ['navs'];
 
-    public function setUp(): void
-    {
-        parent::setUp();
-        BlueprintRepository::partialMock();
-    }
-
     /**
      * @test
      * @environment-setup disableQueries
@@ -78,12 +75,22 @@ public function it_queries_the_tree_inside_a_nav()
         tree {
             depth
             page {
+                id
+                title
                 url
+                ... on NavPage_Footer {
+                    foo
+                }
             }
             children {
                 depth
                 page {
+                    id
+                    title
                     url
+                    ... on NavPage_Footer {
+                        foo
+                    }
                 }
             }
         }
@@ -100,17 +107,52 @@ public function it_queries_the_tree_inside_a_nav()
                     'tree' => [
                         [
                             'depth' => 1,
-                            'page' => ['url' => '/one'],
+                            'page' => [
+                                'id' => 'id-one',
+                                'title' => 'One',
+                                'url' => '/one',
+                                'foo' => 'bar',
+                            ],
                             'children' => [
                                 [
                                     'depth' => 2,
-                                    'page' => ['url' => '/one/nested'],
+                                    'page' => [
+                                        'id' => 'id-one-nested',
+                                        'title' => 'Nested',
+                                        'url' => '/one/nested',
+                                        'foo' => 'baz',
+                                    ],
                                 ],
                             ],
                         ],
                         [
                             'depth' => 1,
-                            'page' => ['url' => '/two'],
+                            'page' => [
+                                'id' => 'id-two',
+                                'title' => 'Two',
+                                'url' => '/two',
+                                'foo' => null,
+                            ],
+                            'children' => [],
+                        ],
+                        [
+                            'depth' => 1,
+                            'page' => [
+                                'id' => 'id-just-url',
+                                'title' => null,
+                                'url' => '/just-url',
+                                'foo' => null,
+                            ],
+                            'children' => [],
+                        ],
+                        [
+                            'depth' => 1,
+                            'page' => [
+                                'id' => 'id-entry',
+                                'title' => 'Entry Title',
+                                'url' => '/blog/the-entry',
+                                'foo' => 'overridden foo',
+                            ],
                             'children' => [],
                         ],
                     ],
@@ -135,14 +177,14 @@ public function it_queries_the_tree_inside_a_nav_using_fragments_for_pseudo_recu
     }
 }
 
-fragment Children on TreeBranch {
+fragment Children on NavTreeBranch {
     depth
     page {
         url
     }
 }
 
-fragment RecursiveChildren on TreeBranch {
+fragment RecursiveChildren on NavTreeBranch {
     children {
         ...Children
         children {
@@ -189,6 +231,16 @@ public function it_queries_the_tree_inside_a_nav_using_fragments_for_pseudo_recu
                             'page' => ['url' => '/two'],
                             'children' => [],
                         ],
+                        [
+                            'depth' => 1,
+                            'page' => ['url' => '/just-url'],
+                            'children' => [],
+                        ],
+                        [
+                            'depth' => 1,
+                            'page' => ['url' => '/blog/the-entry'],
+                            'children' => [],
+                        ],
                     ],
                 ],
             ]]);
@@ -199,16 +251,29 @@ public function it_queries_the_tree_inside_a_nav_with_entries()
     {
         $this->createEntries();
 
-        Nav::make('footer')->title('Footer')->maxDepth(3)->expectsRoot(false)->tap(function ($nav) {
+        BlueprintRepository::partialMock();
+        $blueprint = Blueprint::makeFromFields(['foo' => ['type' => 'text']]);
+        BlueprintRepository::shouldReceive('find')->with('navigation.footer')->andReturn($blueprint);
+
+        Nav::make('footer')->title('Footer')->collections(['blog'])->maxDepth(3)->expectsRoot(false)->tap(function ($nav) {
             $nav->makeTree('en', [
                 [
+                    'id' => 'id-one',
                     'entry' => '1',
+                    'data' => ['foo' => 'bar'],
                     'children' => [
                         [
+                            'id' => 'id-two',
                             'entry' => '2',
+                            'data' => ['foo' => 'baz'],
                         ],
                     ],
                 ],
+                [
+                    'id' => 'id-not-entry',
+                    'url' => '/not-an-entry',
+                    'title' => 'Not an entry',
+                ],
             ])->save();
         })->save();
 
@@ -227,15 +292,21 @@ public function it_queries_the_tree_inside_a_nav_with_entries()
     }
 }
 
-fragment Page on TreeBranch {
+fragment Page on NavTreeBranch {
     page {
         id
+        entry_id
         title
-        slug
-        ... on EntryPage_Blog_Article {
+        ... on EntryInterface {
+            slug
+        }
+        ... on NavEntryPage_Footer_Blog_Article {
+            foo
             intro
+            edit_url
         }
-        ... on EntryPage_Blog_ArtDirected {
+        ... on NavEntryPage_Footer_Blog_ArtDirected {
+            foo
             hero_image
         }
     }
@@ -252,23 +323,37 @@ public function it_queries_the_tree_inside_a_nav_with_entries()
                         [
                             'depth' => 1,
                             'page' => [
-                                'id' => '1',
+                                'id' => 'id-one',
+                                'entry_id' => '1',
                                 'title' => 'Standard Blog Post',
                                 'slug' => 'standard-blog-post',
                                 'intro' => 'The intro',
+                                'foo' => 'bar',
+                                'edit_url' => 'http://localhost/cp/collections/blog/entries/1/standard-blog-post',
                             ],
                             'children' => [
                                 [
                                     'depth' => 2,
                                     'page' => [
-                                        'id' => '2',
+                                        'id' => 'id-two',
+                                        'entry_id' => '2',
                                         'title' => 'Art Directed Blog Post',
                                         'slug' => 'art-directed-blog-post',
                                         'hero_image' => 'hero.jpg',
+                                        'foo' => 'baz',
                                     ],
                                 ],
                             ],
                         ],
+                        [
+                            'depth' => 1,
+                            'page' => [
+                                'id' => 'id-not-entry',
+                                'entry_id' => null,
+                                'title' => 'Not an entry',
+                            ],
+                            'children' => [],
+                        ],
                     ],
                 ],
             ]]);
@@ -277,6 +362,7 @@ public function it_queries_the_tree_inside_a_nav_with_entries()
     /** @test */
     public function it_queries_the_tree_inside_a_nav_in_a_specific_site()
     {
+        config(['app.debug' => true]);
         $this->createFooterNav();
 
         $query = <<<'GQL'
@@ -286,11 +372,17 @@ public function it_queries_the_tree_inside_a_nav_in_a_specific_site()
             depth
             page {
                 url
+                ... on NavPage_Footer {
+                    foo
+                }
             }
             children {
                 depth
                 page {
                     url
+                    ... on NavPage_Footer {
+                        foo
+                    }
                 }
             }
         }
@@ -307,17 +399,17 @@ public function it_queries_the_tree_inside_a_nav_in_a_specific_site()
                     'tree' => [
                         [
                             'depth' => 1,
-                            'page' => ['url' => '/fr-one'],
+                            'page' => ['url' => '/fr-one', 'foo' => 'le-bar'],
                             'children' => [
                                 [
                                     'depth' => 2,
-                                    'page' => ['url' => '/fr-one/fr-nested'],
+                                    'page' => ['url' => '/fr-one/fr-nested', 'foo' => null],
                                 ],
                             ],
                         ],
                         [
                             'depth' => 1,
-                            'page' => ['url' => '/fr-two'],
+                            'page' => ['url' => '/fr-two', 'foo' => null],
                             'children' => [],
                         ],
                     ],
@@ -327,21 +419,34 @@ public function it_queries_the_tree_inside_a_nav_in_a_specific_site()
 
     private function createFooterNav()
     {
-        Nav::make('footer')->title('Footer')->maxDepth(3)->expectsRoot(false)->tap(function ($nav) {
+        Collection::make('blog')->routes('/blog/{slug}')->save();
+        EntryFactory::id('1')->slug('the-entry')->collection('blog')->data(['title' => 'Entry Title', 'foo' => 'foo in entry'])->create();
+
+        BlueprintRepository::partialMock();
+        $blueprint = Blueprint::makeFromFields(['foo' => ['type' => 'text']]);
+        BlueprintRepository::shouldReceive('find')->with('navigation.footer')->andReturn($blueprint);
+
+        Nav::make('footer')->title('Footer')->maxDepth(3)->expectsRoot(false)->collections(['blog'])->tap(function ($nav) {
             $nav->makeTree('en', [
                 [
+                    'id' => 'id-one',
                     'url' => '/one',
                     'title' => 'One',
+                    'data' => ['foo' => 'bar'],
                     'children' => [
                         [
+                            'id' => 'id-one-nested',
                             'url' => '/one/nested',
                             'title' => 'Nested',
+                            'data' => ['foo' => 'baz'],
                             'children' => [
                                 [
+                                    'id' => 'id-one-nested-doublenested',
                                     'url' => '/one/nested/double-nested',
                                     'title' => 'Double Nested',
                                     'children' => [
                                         [
+                                            'id' => 'id-one-nested-doublenested-tripenested',
                                             'url' => '/one/nested/double-nested/triple-nested',
                                             'title' => 'Triple Nested',
                                         ],
@@ -352,24 +457,39 @@ private function createFooterNav()
                     ],
                 ],
                 [
+                    'id' => 'id-two',
                     'url' => '/two',
                     'title' => 'Two',
                 ],
+                [
+                    'id' => 'id-just-url',
+                    'url' => '/just-url',
+                ],
+                [
+                    'id' => 'id-entry',
+                    'entry' => '1',
+                    'data' => ['foo' => 'overridden foo'],
+                ],
             ])->save();
             $nav->makeTree('fr', [
                 [
+                    'id' => 'id-fr-one',
                     'url' => '/fr-one',
                     'title' => 'Fr One',
+                    'data' => ['foo' => 'le-bar'],
                     'children' => [
                         [
+                            'id' => 'id-fr-one-nested',
                             'url' => '/fr-one/fr-nested',
                             'title' => 'Fr Nested',
                             'children' => [
                                 [
+                                    'id' => 'id-fr-one-nested-doublenested',
                                     'url' => '/fr-one/fr-nested/fr-double-nested',
                                     'title' => 'Fr Double Nested',
                                     'children' => [
                                         [
+                                            'id' => 'id-fr-one-nested-doublenested-tripenested',
                                             'url' => '/fr-one/fr-nested/fr-double-nested/fr-triple-nested',
                                             'title' => 'Fr Triple Nested',
                                         ],
@@ -380,6 +500,7 @@ private function createFooterNav()
                     ],
                 ],
                 [
+                    'id' => 'id-fr-two',
                     'url' => '/fr-two',
                     'title' => 'Fr Two',
                 ],
diff --git a/tests/Feature/GraphQL/PageTest.php b/tests/Feature/GraphQL/PageTest.php
index f6c66f5acd3..29e3e5dca6f 100644
--- a/tests/Feature/GraphQL/PageTest.php
+++ b/tests/Feature/GraphQL/PageTest.php
@@ -5,6 +5,7 @@
 use Facades\Tests\Factories\EntryFactory;
 use Statamic\Facades\Collection;
 use Statamic\Facades\GraphQL;
+use Statamic\Facades\Nav;
 use Statamic\Structures\CollectionStructure;
 use Tests\PreventSavingStacheItemsToDisk;
 use Tests\TestCase;
@@ -15,11 +16,11 @@ class PageTest extends TestCase
     use PreventSavingStacheItemsToDisk;
     use EnablesQueries;
 
-    protected $enabledQueries = ['collections', 'entries'];
+    protected $enabledQueries = ['navs'];
 
     private function createData()
     {
-        $collection = Collection::make('pages')->title('Pages')->routes(['en' => '{parent_uri}/{slug}']);
+        $collection = Collection::make('pages')->title('Pages');
         $structure = (new CollectionStructure)->maxDepth(3)->expectsRoot(true);
         $collection->structure($structure)->save();
 
@@ -27,10 +28,11 @@ private function createData()
         EntryFactory::collection('pages')->id('about')->slug('about')->create();
         EntryFactory::collection('pages')->id('team')->slug('team')->create();
 
-        $collection->structure()->in('en')->tree([
-            ['entry' => 'home'],
-            ['entry' => 'about', 'children' => [
-                ['entry' => 'team'],
+        $nav = tap(Nav::make('links')->collections(['pages']))->save();
+        $nav->makeTree('en', [
+            ['id' => 'a', 'entry' => 'home'],
+            ['id' => 'b', 'entry' => 'about', 'children' => [
+                ['id' => 'c', 'entry' => 'team'],
             ]],
         ])->save();
     }
@@ -39,23 +41,21 @@ private function structureQuery()
     {
         return <<<'GQL'
 {
-    collection(handle: "pages") {
-        structure {
+    nav(handle: "links") {
             tree {
                 depth
                 page {
-                    id
+                    entry_id
                     custom
                 }
                 children {
                     depth
                     page {
-                        id
+                        entry_id
                         custom
                     }
                 }
             }
-        }
     }
 }
 GQL;
@@ -64,30 +64,28 @@ private function structureQuery()
     private function expectedStructureQueryResponse()
     {
         return ['data' => [
-            'collection' => [
-                'structure' => [
-                    'tree' => [
-                        [
-                            'depth' => 1,
-                            'page' => [
-                                'id' => 'home',
-                                'custom' => 'custom home',
-                            ],
-                            'children' => [],
+            'nav' => [
+                'tree' => [
+                    [
+                        'depth' => 1,
+                        'page' => [
+                            'entry_id' => 'home',
+                            'custom' => 'custom home',
                         ],
-                        [
-                            'depth' => 1,
-                            'page' => [
-                                'id' => 'about',
-                                'custom' => 'custom about',
-                            ],
-                            'children' => [
-                                [
-                                    'depth' => 2,
-                                    'page' => [
-                                        'id' => 'team',
-                                        'custom' => 'custom team',
-                                    ],
+                        'children' => [],
+                    ],
+                    [
+                        'depth' => 1,
+                        'page' => [
+                            'entry_id' => 'about',
+                            'custom' => 'custom about',
+                        ],
+                        'children' => [
+                            [
+                                'depth' => 2,
+                                'page' => [
+                                    'entry_id' => 'team',
+                                    'custom' => 'custom team',
                                 ],
                             ],
                         ],
@@ -98,34 +96,13 @@ private function expectedStructureQueryResponse()
     }
 
     /** @test */
-    public function adding_a_field_to_entry_interface_will_appear_within_pages()
-    {
-        GraphQL::addField('EntryInterface', 'custom', function () {
-            return [
-                'type' => GraphQL::string(),
-                'resolve' => function ($page) {
-                    return 'custom '.$page->id();
-                },
-            ];
-        });
-
-        $this->createData();
-
-        $this
-            ->withoutExceptionHandling()
-            ->post('/graphql', ['query' => $this->structureQuery()])
-            ->assertGqlOk()
-            ->assertExactJson($this->expectedStructureQueryResponse());
-    }
-
-    /** @test */
-    public function adding_a_field_to_page_interface_will_appear_within_pages_but_not_entries()
+    public function custom_fields_can_be_added_to_interface()
     {
         GraphQL::addField('PageInterface', 'custom', function () {
             return [
                 'type' => GraphQL::string(),
                 'resolve' => function ($page) {
-                    return 'custom '.$page->id();
+                    return 'custom '.$page->reference();
                 },
             ];
         });
@@ -137,69 +114,5 @@ public function adding_a_field_to_page_interface_will_appear_within_pages_but_no
             ->post('/graphql', ['query' => $this->structureQuery()])
             ->assertGqlOk()
             ->assertExactJson($this->expectedStructureQueryResponse());
-
-        $entryQuery = <<<'GQL'
-{
-    entry(id: "home") {
-        id
-        custom
-    }
-}
-GQL;
-
-        $this
-            ->withoutExceptionHandling()
-            ->post('/graphql', ['query' => $entryQuery])
-            ->assertJson(['errors' => [[
-                'message' => 'Cannot query field "custom" on type "EntryInterface".',
-            ]]]);
-    }
-
-    /** @test */
-    public function it_can_add_custom_fields_to_an_implementation()
-    {
-        GraphQL::addField('EntryPage_Pages_Pages', 'custom', function () {
-            return [
-                'type' => GraphQL::string(),
-                'resolve' => function ($page) {
-                    return 'custom '.$page->id();
-                },
-            ];
-        });
-
-        $this->createData();
-
-        $query = <<<'GQL'
-{
-    collection(handle: "pages") {
-        structure {
-            tree {
-                depth
-                page {
-                    id
-                    ... on EntryPage_Pages_Pages {
-                        custom
-                    }
-                }
-                children {
-                    depth
-                    page {
-                        id
-                        ... on EntryPage_Pages_Pages {
-                            custom
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-GQL;
-
-        $this
-            ->withoutExceptionHandling()
-            ->post('/graphql', ['query' => $query])
-            ->assertGqlOk()
-            ->assertExactJson($this->expectedStructureQueryResponse());
     }
 }
diff --git a/tests/Feature/Navigation/CreateNavigationPageTest.php b/tests/Feature/Navigation/CreateNavigationPageTest.php
new file mode 100644
index 00000000000..0a8d59fb94c
--- /dev/null
+++ b/tests/Feature/Navigation/CreateNavigationPageTest.php
@@ -0,0 +1,159 @@
+<?php
+
+namespace Tests\Feature\Navigation;
+
+use Facades\Statamic\Fields\BlueprintRepository;
+use Facades\Statamic\Fields\FieldtypeRepository;
+use Facades\Tests\Factories\EntryFactory;
+use Statamic\Facades\Blueprint;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Nav;
+use Statamic\Facades\User;
+use Statamic\Fields\Fieldtype;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class CreateNavigationPageTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    private function request($nav, $params = [], $site = 'en')
+    {
+        $url = cp_route('navigation.pages.create', $nav->handle());
+
+        $params = array_merge($params, ['site' => $site]);
+
+        return $this->getJson($url.'?'.http_build_query($params));
+    }
+
+    private function mockTextFieldtype()
+    {
+        FieldtypeRepository::shouldReceive('find')->with('text')
+            ->andReturn(new class extends Fieldtype
+            {
+                public function preProcess($value)
+                {
+                    if (! $value) {
+                        return;
+                    }
+
+                    return $value.' (preprocessed)';
+                }
+
+                public function preload()
+                {
+                    return ['hello' => 'world'];
+                }
+            });
+    }
+
+    /** @test */
+    public function it_gets_the_values_for_a_regular_nav_item()
+    {
+        $this->withoutExceptionHandling();
+        $this->mockTextFieldtype();
+        $user = tap(User::make()->makeSuper())->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [])->save();
+        $blueprint = Blueprint::makeFromFields(['foo' => ['type' => 'text']]);
+        BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($blueprint);
+
+        $this
+            ->actingAs($user)
+            ->request($nav)
+            ->assertJson([
+                'values' => [
+                    'foo' => null,
+                    'title' => null,
+                    'url' => null,
+                ],
+                'meta' => [
+                    'foo' => ['hello' => 'world'],
+                    'title' => ['hello' => 'world'],
+                    'url' => ['hello' => 'world'],
+                ],
+                'originValues' => null,
+                'originMeta' => null,
+                'localizedFields' => [],
+                'syncableFields' => [],
+            ]);
+    }
+
+    /** @test */
+    public function it_gets_the_values_for_an_entry_nav_item()
+    {
+        $this->withoutExceptionHandling();
+        $this->mockTextFieldtype();
+        $user = tap(User::make()->makeSuper())->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [])->save();
+
+        $entryBlueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+            'baz' => ['type' => 'text'],
+            'qux' => ['type' => 'text'],
+        ]);
+
+        $navBlueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+            'baz' => ['type' => 'text'],
+        ]);
+
+        BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($navBlueprint);
+        BlueprintRepository::shouldReceive('in')->with('collections/articles')->andReturn(collect(['articles' => $entryBlueprint]));
+
+        tap(Collection::make('articles')->cascade(['baz' => 'collection baz']))->save();
+
+        EntryFactory::id('123')
+            ->collection('articles')
+            ->data([
+                'title' => 'entry title',
+                'foo' => 'entry foo',
+                'bar' => 'entry bar',
+                'qux' => 'entry qux',
+            ])
+            ->create();
+
+        $this
+            ->actingAs($user)
+            ->request($nav, ['entry' => '123'])
+            ->assertJson([
+                'values' => [
+                    'title' => 'entry title (preprocessed)',
+                    'foo' => 'entry foo (preprocessed)',
+                    'bar' => 'entry bar (preprocessed)',
+                    'baz' => null,
+                ],
+                'meta' => [
+                    'title' => ['hello' => 'world'],
+                    'url' => ['hello' => 'world'],
+                    'foo' => ['hello' => 'world'],
+                    'bar' => ['hello' => 'world'],
+                ],
+                'originValues' => [
+                    'title' => 'entry title (preprocessed)',
+                    'foo' => 'entry foo (preprocessed)',
+                    'bar' => 'entry bar (preprocessed)',
+                    'baz' => null,
+                ],
+                'originMeta' => [
+                    'title' => ['hello' => 'world'],
+                    'url' => ['hello' => 'world'],
+                    'foo' => ['hello' => 'world'],
+                    'bar' => ['hello' => 'world'],
+                    'baz' => ['hello' => 'world'],
+                ],
+                'localizedFields' => [],
+                'syncableFields' => [
+                    'foo',
+                    'bar',
+                    'baz',
+                    'title',
+                ],
+            ]);
+    }
+}
diff --git a/tests/Feature/Navigation/EditNavigationPageTest.php b/tests/Feature/Navigation/EditNavigationPageTest.php
new file mode 100644
index 00000000000..2e06d031610
--- /dev/null
+++ b/tests/Feature/Navigation/EditNavigationPageTest.php
@@ -0,0 +1,225 @@
+<?php
+
+namespace Tests\Feature\Navigation;
+
+use Facades\Statamic\Fields\BlueprintRepository;
+use Facades\Statamic\Fields\FieldtypeRepository;
+use Facades\Tests\Factories\EntryFactory;
+use Statamic\Facades\Blueprint;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Nav;
+use Statamic\Facades\User;
+use Statamic\Fields\Fieldtype;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class EditNavigationPageTest extends TestCase
+{
+    use FakesRoles;
+    use PreventSavingStacheItemsToDisk;
+
+    private function request($nav, $id, $site = 'en')
+    {
+        $url = cp_route('navigation.pages.edit', [$nav->handle(), $id]);
+
+        return $this->getJson($url.'?site='.$site);
+    }
+
+    private function mockTextFieldtype()
+    {
+        FieldtypeRepository::shouldReceive('find')->with('text')
+            ->andReturn(new class extends Fieldtype
+            {
+                public function preProcess($value)
+                {
+                    if (! $value) {
+                        return;
+                    }
+
+                    return $value.' (preprocessed)';
+                }
+
+                public function preload()
+                {
+                    return ['hello' => 'world'];
+                }
+            });
+    }
+
+    /** @test */
+    public function it_gets_the_values_for_a_regular_nav_item()
+    {
+        $this->withoutExceptionHandling();
+        $this->mockTextFieldtype();
+        $user = tap(User::make()->makeSuper())->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [
+            [
+                'id' => 'id7',
+                'title' => 'The title',
+                'url' => 'http://example.com',
+                'data' => [
+                    'foo' => 'bar',
+                ],
+            ],
+        ])->save();
+        $blueprint = Blueprint::makeFromFields(['foo' => ['type' => 'text']]);
+        BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($blueprint);
+
+        $this
+            ->actingAs($user)
+            ->request($nav, 'id7')
+            ->assertJson([
+                'values' => [
+                    'foo' => 'bar (preprocessed)',
+                    'title' => 'The title (preprocessed)',
+                    'url' => 'http://example.com (preprocessed)',
+                ],
+                'meta' => [
+                    'foo' => ['hello' => 'world'],
+                    'title' => ['hello' => 'world'],
+                    'url' => ['hello' => 'world'],
+                ],
+                'originValues' => null,
+                'originMeta' => null,
+                'localizedFields' => [
+                    'foo',
+                    'title',
+                    'url',
+                ],
+                'syncableFields' => [],
+            ]);
+    }
+
+    /** @test */
+    public function it_gets_the_values_for_a_text_only_nav_item()
+    {
+        $this->withoutExceptionHandling();
+        $this->mockTextFieldtype();
+        $user = tap(User::make()->makeSuper())->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [
+            [
+                'id' => 'id7',
+                'url' => 'http://example.com',
+                'data' => [
+                    'foo' => 'bar',
+                ],
+            ],
+        ])->save();
+        $blueprint = Blueprint::makeFromFields(['foo' => ['type' => 'text']]);
+        BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($blueprint);
+
+        $this
+            ->actingAs($user)
+            ->request($nav, 'id7')
+            ->assertJson([
+                'values' => [
+                    'title' => null,
+                    'url' => 'http://example.com (preprocessed)',
+                    'foo' => 'bar (preprocessed)',
+                ],
+                'meta' => [
+                    'title' => ['hello' => 'world'],
+                    'foo' => ['hello' => 'world'],
+                    'url' => ['hello' => 'world'],
+                ],
+                'originValues' => null,
+                'originMeta' => null,
+                'localizedFields' => [
+                    'foo',
+                    'url',
+                ],
+                'syncableFields' => [],
+            ]);
+    }
+
+    /** @test */
+    public function it_gets_the_values_for_an_entry_nav_item()
+    {
+        $this->withoutExceptionHandling();
+        $this->mockTextFieldtype();
+        $user = tap(User::make()->makeSuper())->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [
+            [
+                'id' => 'id7',
+                'entry' => '123',
+                'title' => 'The page title',
+                'data' => [
+                    'foo' => 'page foo',
+                ],
+            ],
+        ])->save();
+
+        $entryBlueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+            'baz' => ['type' => 'text'],
+            'qux' => ['type' => 'text'],
+        ]);
+
+        $navBlueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+            'baz' => ['type' => 'text'],
+        ]);
+
+        BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($navBlueprint);
+        BlueprintRepository::shouldReceive('in')->with('collections/articles')->andReturn(collect(['articles' => $entryBlueprint]));
+
+        tap(Collection::make('articles')->cascade(['baz' => 'collection baz']))->save();
+
+        EntryFactory::id('123')
+            ->collection('articles')
+            ->data([
+                'title' => 'entry title',
+                'foo' => 'entry foo',
+                'bar' => 'entry bar',
+                'qux' => 'entry qux',
+            ])
+            ->create();
+
+        $this
+            ->actingAs($user)
+            ->request($nav, 'id7')
+            ->assertJson([
+                'values' => [
+                    'title' => 'The page title (preprocessed)',
+                    'foo' => 'page foo (preprocessed)',
+                    'bar' => 'entry bar (preprocessed)',
+                    'baz' => null,
+                ],
+                'meta' => [
+                    'title' => ['hello' => 'world'],
+                    'url' => ['hello' => 'world'],
+                    'foo' => ['hello' => 'world'],
+                    'bar' => ['hello' => 'world'],
+                ],
+                'originValues' => [
+                    'title' => 'entry title (preprocessed)',
+                    'foo' => 'entry foo (preprocessed)',
+                    'bar' => 'entry bar (preprocessed)',
+                    'baz' => null,
+                ],
+                'originMeta' => [
+                    'title' => ['hello' => 'world'],
+                    'url' => ['hello' => 'world'],
+                    'foo' => ['hello' => 'world'],
+                    'bar' => ['hello' => 'world'],
+                    'baz' => ['hello' => 'world'],
+                ],
+                'localizedFields' => [
+                    'foo',
+                    'title',
+                ],
+                'syncableFields' => [
+                    'foo',
+                    'bar',
+                    'baz',
+                    'title',
+                ],
+            ]);
+    }
+}
diff --git a/tests/Feature/Navigation/UpdateNavigationTreeTest.php b/tests/Feature/Navigation/UpdateNavigationTreeTest.php
new file mode 100644
index 00000000000..01901a39aa4
--- /dev/null
+++ b/tests/Feature/Navigation/UpdateNavigationTreeTest.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace Tests\Feature\Navigation;
+
+use Facades\Statamic\Fields\BlueprintRepository;
+use Facades\Statamic\Fields\FieldtypeRepository;
+use Facades\Statamic\Structures\BranchIdGenerator;
+use Statamic\Facades\Blueprint;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Nav;
+use Statamic\Facades\User;
+use Statamic\Fields\Fieldtype;
+use Tests\FakesRoles;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+class UpdateNavigationTreeTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+    use FakesRoles;
+
+    private function mockTextFieldtype()
+    {
+        FieldtypeRepository::shouldReceive('find')->with('text')
+            ->andReturn(new class extends Fieldtype
+            {
+                public function process($value)
+                {
+                    if (! $value) {
+                        return $value;
+                    }
+
+                    return $value.' (processed)';
+                }
+            });
+    }
+
+    /** @test */
+    public function it_updates_the_tree()
+    {
+        $this->withoutExceptionHandling();
+        $this->mockTextFieldtype();
+
+        $blueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'text'],
+            'baz' => ['type' => 'text'],
+            'qux' => ['type' => 'text'],
+        ]);
+        BlueprintRepository::shouldReceive('find')->with('navigation.test')->andReturn($blueprint);
+        BranchIdGenerator::shouldReceive('generate')->times(3)->andReturn('newly-generated-id1', 'newly-generated-id2', 'newly-generated-id3');
+
+        $user = tap(User::make()->makeSuper())->save();
+        $nav = tap(Nav::make('test'))->save();
+        $nav->makeTree('en', [
+            ['id' => 'id1', 'title' => 'URL', 'url' => 'http://example.com', 'children' => [
+                ['id' => 'id6', 'title' => 'Nested text'],
+            ]],
+            ['id' => 'id2', 'title' => 'Just Text'],
+            ['id' => 'id3', 'entry' => '123'],
+            ['id' => 'id4', 'entry' => '456'],
+            ['id' => 'id5', 'title' => 'Being removed'],
+        ])->save();
+
+        $this
+            ->actingAs($user)
+            ->update($nav, [
+                'pages' => [
+                    ['id' => 'id1', 'children' => []],
+                    ['id' => 'id3', 'children' => []],
+                    ['id' => 'new-standard-page', 'children' => []],
+                    ['id' => 'id2', 'children' => [
+                        ['id' => 'id4', 'children' => []],
+                    ]],
+                    ['id' => 'new-entry-page', 'children' => []],
+                    ['id' => 'new-entry-page-with-values', 'children' => []],
+                ],
+                'data' => [
+                    'id1' => [
+                        'values' => [
+                            'title' => 'Updated URL',
+                            'url' => 'http://updated-example.com',
+                        ],
+                        'localizedFields' => ['title', 'url'],
+                    ],
+                    'id2' => [
+                        'values' => [
+                            'title' => 'Updated Just Text',
+                        ],
+                        'localizedFields' => ['title'],
+                    ],
+                    'id4' => [
+                        'entry' => '456',
+                        'values' => [
+                            'title' => 'Overridden title',
+                            'foo' => 'Overridden foo',
+                            'bar' => 'bar456',
+                            'baz' => [],
+                            'qux' => null,
+                        ],
+                        'localizedFields' => ['title', 'foo', 'baz', 'qux'],
+                    ],
+                    'new-standard-page' => [
+                        'values' => [
+                            'title' => 'New Branch',
+                        ],
+                        'localizedFields' => ['title'],
+                        'new' => true,
+                    ],
+                    'new-entry-page' => [
+                        'entry' => '789',
+                        'new' => true,
+                    ],
+                    'new-entry-page-with-values' => [
+                        'entry' => '910',
+                        'new' => true,
+                        'values' => [],
+                        'localizedFields' => [],
+                    ],
+                ],
+            ])
+            ->assertOk()
+            ->assertJson([
+                'generatedIds' => [
+                    'new-standard-page' => 'newly-generated-id1',
+                    'new-entry-page' => 'newly-generated-id2',
+                ],
+            ]);
+
+        $this->assertEquals([
+            ['id' => 'id1', 'title' => 'Updated URL (processed)', 'url' => 'http://updated-example.com (processed)'],
+            ['id' => 'id3', 'entry' => '123'],
+            ['id' => 'newly-generated-id1', 'title' => 'New Branch (processed)'],
+            ['id' => 'id2', 'title' => 'Updated Just Text (processed)', 'children' => [
+                ['id' => 'id4', 'entry' => '456', 'title' => 'Overridden title (processed)', 'data' => [
+                    'foo' => 'Overridden foo (processed)',
+                    'baz' => [],   // Intentionally not stripped out so that empty values can be saved on the page when the
+                    'qux' => null, // entry has a value. If they were stripped out, it would fall back to the entry's value.
+                ]],
+            ]],
+            ['id' => 'newly-generated-id2', 'entry' => '789'],
+            ['id' => 'newly-generated-id3', 'entry' => '910'],
+        ], $nav->in('en')->tree());
+    }
+
+    /** @test */
+    public function it_denies_access_if_you_dont_have_permission_to_reorder()
+    {
+        $this->markTestIncomplete();
+
+        $this->setTestRoles(['test' => ['access cp']]);
+        $user = tap(User::make()->assignRole('test'))->save();
+        $collection = tap(Collection::make('test')->structureContents(['tree' => []]))->save();
+
+        $this
+            ->actingAs($user)
+            ->update($collection, ['site' => 'en', 'pages' => []])
+            ->assertForbidden();
+    }
+
+    public function update($nav, $payload = [])
+    {
+        $validParams = [
+            'site' => 'en',
+        ];
+
+        return $this->patchJson(
+            cp_route('navigation.tree.update', $nav->handle()),
+            array_merge($validParams, $payload)
+        );
+    }
+
+    /** @test */
+    public function it_updates_a_specific_sites_tree()
+    {
+        $this->markTestIncomplete();
+    }
+}
diff --git a/tests/GraphQL/AssetInterfaceTest.php b/tests/GraphQL/AssetInterfaceTest.php
index e9744e79338..071023d3627 100644
--- a/tests/GraphQL/AssetInterfaceTest.php
+++ b/tests/GraphQL/AssetInterfaceTest.php
@@ -38,7 +38,6 @@ public function it_adds_types()
 
         AssetInterface::addTypes();
 
-        GraphQL::shouldHaveReceived('addType')->with(AssetInterface::class)->once();
         GraphQL::shouldHaveReceived('addTypes')->withArgs(function ($args) {
             $this->assertEveryItemIsInstanceOf(AssetType::class, $args);
             $this->assertEquals($expected = [
diff --git a/tests/GraphQL/EntryInterfaceTest.php b/tests/GraphQL/EntryInterfaceTest.php
index 4ab586bf62f..30e66e10ad4 100644
--- a/tests/GraphQL/EntryInterfaceTest.php
+++ b/tests/GraphQL/EntryInterfaceTest.php
@@ -44,18 +44,13 @@ public function it_adds_types()
 
         EntryInterface::addTypes();
 
-        GraphQL::shouldHaveReceived('addType')->with(EntryInterface::class)->once();
         GraphQL::shouldHaveReceived('addTypes')->withArgs(function ($args) {
             $this->assertEveryItemIsInstanceOf(EntryType::class, $args);
             $this->assertEquals($expected = [
                 'Entry_BlogPosts_Article',
-                'EntryPage_BlogPosts_Article',
                 'Entry_BlogPosts_ArtDirected',
-                'EntryPage_BlogPosts_ArtDirected',
                 'Entry_MenuItems_Appetizer',
-                'EntryPage_MenuItems_Appetizer',
                 'Entry_MenuItems_Entree',
-                'EntryPage_MenuItems_Entree',
             ], $actual = collect($args)->map->name->all());
 
             return $actual === $expected;
diff --git a/tests/GraphQL/GlobalSetInterfaceTest.php b/tests/GraphQL/GlobalSetInterfaceTest.php
index 7f96b32d8e2..7223c203699 100644
--- a/tests/GraphQL/GlobalSetInterfaceTest.php
+++ b/tests/GraphQL/GlobalSetInterfaceTest.php
@@ -38,7 +38,6 @@ public function it_adds_types()
 
         GlobalSetInterface::addTypes();
 
-        GraphQL::shouldHaveReceived('addType')->with(GlobalSetInterface::class)->once();
         GraphQL::shouldHaveReceived('addTypes')->withArgs(function ($args) {
             $this->assertEveryItemIsInstanceOf(GlobalSetType::class, $args);
             $this->assertEquals($expected = [
diff --git a/tests/GraphQL/NavPageInterfaceTest.php b/tests/GraphQL/NavPageInterfaceTest.php
new file mode 100644
index 00000000000..ef1f4300f44
--- /dev/null
+++ b/tests/GraphQL/NavPageInterfaceTest.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Tests\GraphQL;
+
+use Facades\Statamic\Fields\BlueprintRepository;
+use Statamic\Facades\Blueprint;
+use Statamic\Facades\GraphQL;
+use Statamic\Facades\Nav;
+use Statamic\GraphQL\Types\NavPageInterface;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+/** @group graphql */
+class NavPageInterfaceTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_gets_the_fields()
+    {
+        $nav = tap(Nav::make('links'))->save();
+
+        $blueprint = Blueprint::makeFromFields([
+            'foo' => ['type' => 'text'],
+            'bar' => ['type' => 'integer'],
+        ]);
+        BlueprintRepository::shouldReceive('find')->with('navigation.links')->andReturn($blueprint);
+
+        $interface = new NavPageInterface($nav);
+
+        $this->assertEquals([
+            'foo' => ['type' => GraphQL::string()],
+            'bar' => ['type' => GraphQL::int()],
+        ], $interface->fields());
+    }
+}
diff --git a/tests/GraphQL/PageInterfaceTest.php b/tests/GraphQL/PageInterfaceTest.php
new file mode 100644
index 00000000000..c7ce029ad15
--- /dev/null
+++ b/tests/GraphQL/PageInterfaceTest.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Tests\GraphQL;
+
+use Facades\Statamic\Fields\BlueprintRepository;
+use Rebing\GraphQL\Support\Facades\GraphQL;
+use Statamic\Facades\Collection;
+use Statamic\Facades\Nav;
+use Statamic\Fields\Blueprint;
+use Statamic\GraphQL\Types\PageInterface;
+use Tests\PreventSavingStacheItemsToDisk;
+use Tests\TestCase;
+
+/** @group graphql */
+class PageInterfaceTest extends TestCase
+{
+    use PreventSavingStacheItemsToDisk;
+
+    /** @test */
+    public function it_adds_types()
+    {
+        GraphQL::spy();
+
+        Nav::make('first_one')->collections(['blog_posts', 'menu_items'])->save();
+        Nav::make('second_one')->collections(['blog_posts'])->save();
+        Nav::make('third_one')->save();
+
+        Collection::make('blog_posts')->save();
+        Collection::make('menu_items')->save();
+        Collection::make('unused_collection')->save();
+        $article = tap($this->partialMock(Blueprint::class), function ($m) {
+            $m->shouldReceive('handle')->andReturn('article');
+            $m->shouldReceive('addGqlTypes')->times(2);
+        });
+        $artDirected = tap($this->partialMock(Blueprint::class), function ($m) {
+            $m->shouldReceive('handle')->andReturn('art_directed');
+            $m->shouldReceive('addGqlTypes')->times(2);
+        });
+        $appetizer = tap($this->partialMock(Blueprint::class), function ($m) {
+            $m->shouldReceive('handle')->andReturn('appetizer');
+            $m->shouldReceive('addGqlTypes')->once();
+        });
+        $entree = tap($this->partialMock(Blueprint::class), function ($m) {
+            $m->shouldReceive('handle')->andReturn('entree');
+            $m->shouldReceive('addGqlTypes')->once();
+        });
+        BlueprintRepository::shouldReceive('in')->with('collections/blog_posts')->andReturn(collect(['article' => $article, 'art_directed' => $artDirected]));
+        BlueprintRepository::shouldReceive('in')->with('collections/menu_items')->andReturn(collect(['appetizer' => $appetizer, 'entree' => $entree]));
+
+        PageInterface::addTypes();
+
+        GraphQL::shouldHaveReceived('addTypes')->withArgs(function ($args) {
+            $this->assertEquals($expected = [
+                'NavPage_FirstOne',
+                'NavBasicPage_FirstOne',
+                'NavEntryPage_FirstOne_BlogPosts_Article',
+                'NavEntryPage_FirstOne_BlogPosts_ArtDirected',
+                'NavEntryPage_FirstOne_MenuItems_Appetizer',
+                'NavEntryPage_FirstOne_MenuItems_Entree',
+                'NavPage_SecondOne',
+                'NavBasicPage_SecondOne',
+                'NavEntryPage_SecondOne_BlogPosts_Article',
+                'NavEntryPage_SecondOne_BlogPosts_ArtDirected',
+                'NavPage_ThirdOne',
+                'NavBasicPage_ThirdOne',
+            ], $actual = collect($args)->map->name->all());
+
+            return $actual === $expected;
+        });
+    }
+}
diff --git a/tests/GraphQL/TermInterfaceTest.php b/tests/GraphQL/TermInterfaceTest.php
index 96a8cc52c66..709b45df600 100644
--- a/tests/GraphQL/TermInterfaceTest.php
+++ b/tests/GraphQL/TermInterfaceTest.php
@@ -44,7 +44,6 @@ public function it_adds_types()
 
         TermInterface::addTypes();
 
-        GraphQL::shouldHaveReceived('addType')->with(TermInterface::class)->once();
         GraphQL::shouldHaveReceived('addTypes')->withArgs(function ($args) {
             $this->assertEveryItemIsInstanceOf(TermType::class, $args);
             $this->assertEquals($expected = [