diff --git a/view/adminhtml/templates/order/create/delivery_date.phtml b/view/adminhtml/templates/order/create/delivery_date.phtml
index f596680..3917dd5 100644
--- a/view/adminhtml/templates/order/create/delivery_date.phtml
+++ b/view/adminhtml/templates/order/create/delivery_date.phtml
@@ -1,14 +1,19 @@
 <?php /** @var \SR\DeliveryDate\Block\Adminhtml\DeliveryDate $block */ ?>
-<br/>
-<label class="label">Delivery Date</label>
-<div class="control">
-    <input class="input-text <?php if ($block->getRequiredDeliveryDate()): ?> required-entry <?php endif ?>"
-           type="text" name="delivery_date" id="delivery_date" readonly="true"/>
+<div class="admin__field">
+    <label for="delivery_date" class="admin__field-label"><span><?= __('Delivery Date') ?></span></label>
+    <div class="admin__field-control">
+        <input class="admin__control-text <?php if ($block->getRequiredDeliveryDate()): ?> required-entry <?php endif ?>"
+               type="text" name="delivery_date" id="delivery_date" readonly="true"/>
+    </div>
 </div>
-
-<label class="label">Comment</label>
-<div class="control">
-    <textarea name="delivery_comment" id="delivery_comment"></textarea>
+<div class="admin__field field-comment">
+    <label for="delivery_comment" class="admin__field-label"><span><?= __('Comment') ?></span></label>
+    <div class="admin__field-control">
+        <textarea
+                id="delivery_comment"
+                name="delivery_comment"
+                class="admin__control-textarea" cols="5" rows="5"></textarea>
+    </div>
 </div>
 <script type="text/javascript">
     require([
diff --git a/view/adminhtml/templates/order_info_shipping_info.phtml b/view/adminhtml/templates/order_info_shipping_info.phtml
index 74e408d..af0fb12 100755
--- a/view/adminhtml/templates/order_info_shipping_info.phtml
+++ b/view/adminhtml/templates/order_info_shipping_info.phtml
@@ -1,20 +1,24 @@
-<div id="delivery-date">
-    <strong><?= __('Delivery Date') ?></strong>
-    <span class="price"><?= $block->getDeliveryDate() ?></span>
-</div>
-<div id="delivery-comment">
-    <strong><?= __('Comment') ?>:</strong>
-    <br/>
-    <span class="price"><?= $block->getDeliveryComment() ?></span>
-</div>
+<section class="admin__page-section" id="delivery-date-content">
+    <div class="admin__page-section-title">
+        <span class="title"><?= $block->escapeHtml(__('Delivery Date Information')) ?></span>
+    </div>
+    <div class="admin__page-section-content">
+        <div id="delivery-date">
+            <strong><?= __('Delivery Date') ?></strong>
+            <span><?= $block->getDeliveryDate() ?></span>
+        </div>
+        <div id="delivery-comment">
+            <strong><?= __('Comment') ?>:</strong>
+            <br/>
+            <?= $block->getDeliveryComment() ?>
+        </div>
+    </div>
+</section>
 <script type="text/javascript">
     require(
         ['jquery'],
         function($) {
-            var element = $('#delivery-date').detach();
-            $('.order-shipping-method').append(element);
-            var element = $('#delivery-comment').detach();
-            $('.order-shipping-method').append(element);
+            $('#delivery-date-content').insertAfter($('.order-view-billing-shipping'));
         }
     );
 </script>
\ No newline at end of file