diff --git a/themes/grav/templates/forms/fields/order/order.html.twig b/themes/grav/templates/forms/fields/order/order.html.twig
index a3f8d14f..951ff755 100644
--- a/themes/grav/templates/forms/fields/order/order.html.twig
+++ b/themes/grav/templates/forms/fields/order/order.html.twig
@@ -40,7 +40,7 @@
                 {% set sortable_count = 0 %}
                 <ul id="ordering" class="orderable {{ field.classes }}">
                 {% for page in siblings if page.order %}
-                    <li class="drag-handle" data-id="{{ page.slug }}" {{ page.slug == data.slug ? 'data-active-id' : ''}}><span class="page-order">{{ page.order }}</span> {{ page.title|e }} <a href="{{ getPageUrl(page) }}"><i class="fa fa-external-link"></i></a></li>
+                    <li class="drag-handle" data-id="{{ page.slug }}" {{ page.slug == data.slug ? 'data-active-id' : ''}}><span class="page-order">{{ page.order|int }}.</span> {{ page.title|e }} <a href="{{ getPageUrl(page) }}"><i class="fa fa-external-link"></i></a></li>
                     {% set sortable_count = loop.index %}
                 {% endfor %}
                 </ul>
diff --git a/themes/grav/templates/forms/fields/parents/parents.html.twig b/themes/grav/templates/forms/fields/parents/parents.html.twig
index 3184495d..06cdc540 100644
--- a/themes/grav/templates/forms/fields/parents/parents.html.twig
+++ b/themes/grav/templates/forms/fields/parents/parents.html.twig
@@ -13,11 +13,16 @@
 
     {% set field = field|merge(defaults) %}
     {% set name = (scope ~ field.name)|fieldName %}
-    {% set parent = context.parent.title ?? page.find(value).title %}
+    {% if form %}
+        {% set parent = form.object.parent.title %}
+    {% else %}
+        {% do admin.enablePages() %}
+        {% set parent = page.find(value).title %}
+    {% endif %}
     <div class="parents-wrapper">
         <div class="form-input-wrapper" data-parents="{{ name }}" data-remodal-target="parents">
             <div class="parent-title" data-parents-field-name="{{ name }}">{{ parent }}</div>
-            <span><i class="fa fa-folder-o"></i> <span data-parents-field-label="{{ name }}">{{ value|default('<root>') }}</span></span>
+            <span><i class="fa fa-folder-o"></i> <span data-parents-field-label="{{ name }}">{{ value|default('/') }}</span></span>
         </div>
 
         <input type="hidden" class="input" name="{{ name }}" data-field-name="{{ field.name }}" value="{{ value|join(', ') }}" />