diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 6cc859749..2be860c62 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -7,7 +7,7 @@
 
 {% block content %}
     <div class="row">
-        <div class="col col-md-6">
+        <div class="col col-12 col-xl-5">
             <div class="card">
                 <h5 class="card-header">
                     Device
@@ -152,8 +152,7 @@
             {% include 'inc/panels/tags.html' %}
             {% include 'inc/panels/comments.html' %}
             {% plugin_left_page object %}
-        </div>
-        <div class="col col-md-6">
+
             <div class="card">
                 <h5 class="card-header">Management</h5>
                 <div class="card-body">
@@ -286,7 +285,31 @@
             </div>
             {% include 'inc/panels/contacts.html' %}
             {% include 'inc/panels/image_attachments.html' %}
-            {% plugin_right_page object %}
+        </div>
+        <div class="col col-12 col-xl-7">
+          <div class="text-end mb-4">
+            <select class="btn btn-sm btn-outline-dark rack-view">
+              <option value="images-and-labels" selected="selected">Images and Labels</option>
+              <option value="images-only">Images only</option>
+              <option value="labels-only">Labels only</option>
+            </select>
+          </div>
+            {% if object.rack %}
+            <div class="row" style="margin-bottom: 20px">
+                <div class="col col-md-6 col-sm-6 col-xs-12 text-center">
+                  <div style="margin-left: 30px">
+                    <h4>Front</h4>
+                    {% include 'dcim/inc/rack_elevation.html' with object=object.rack face='front' extra_params=svg_extra %}
+                  </div>
+                </div>
+                <div class="col col-md-6 col-sm-6 col-xs-12 text-center">
+                  <div style="margin-left: 30px">
+                    <h4>Rear</h4>
+                    {% include 'dcim/inc/rack_elevation.html' with object=object.rack face='rear' extra_params=svg_extra %}
+                  </div>
+                </div>
+            </div>
+            {% endif %}
         </div>
     </div>
     <div class="row">