diff --git a/agent/modals/rack/rack_add.php b/agent/modals/rack/rack_add.php
index d65468c6..1b09c7cb 100644
--- a/agent/modals/rack/rack_add.php
+++ b/agent/modals/rack/rack_add.php
@@ -35,26 +35,6 @@ ob_start();
 
             <div class="tab-pane fade show active" id="pills-details">
 
-                <div class="form-group">
-                    <label>Name <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="name" placeholder="Rack name" maxlength="200" required autofocus>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Description</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="description" placeholder="Description of the rack">
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <label>Type <strong class="text-danger">*</strong></label>
                     <div class="input-group">
@@ -70,6 +50,26 @@ ob_start();
                     </div>
                 </div>
 
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Rack name" maxlength="200" required autofocus>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Number of Units <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-up-alt"></i></span>
+                        </div>
+                        <input type="number" class="form-control" name="units" placeholder="Number of Units" min="1" max="70" required>
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <label>Model</label>
                     <div class="input-group">
@@ -90,26 +90,6 @@ ob_start();
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label>Number of Units <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-up-alt"></i></span>
-                        </div>
-                        <input type="number" class="form-control" name="units" placeholder="Number of Units" min="1" max="70" required>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Physical Location</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200">
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <label>Location</label>
                     <div class="input-group">
@@ -132,6 +112,26 @@ ob_start();
                     </div>
                 </div>
 
+                <div class="form-group">
+                    <label>Physical Location</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Description of the rack">
+                    </div>
+                </div>
+
             </div>
 
             <div class="tab-pane fade" id="pills-notes">
diff --git a/agent/modals/rack/rack_edit.php b/agent/modals/rack/rack_edit.php
index e80301bd..93418505 100644
--- a/agent/modals/rack/rack_edit.php
+++ b/agent/modals/rack/rack_edit.php
@@ -51,26 +51,6 @@ ob_start();
 
             <div class="tab-pane fade show active" id="pills-rack-details<?php echo $rack_id; ?>">
 
-                <div class="form-group">
-                    <label>Name <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="name" placeholder="Rack name" maxlength="200" value="<?php echo $rack_name; ?>" required autofocus>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Description</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="description" placeholder="Description of the rack" value="<?php echo $rack_description; ?>">
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <label>Type <strong class="text-danger">*</strong></label>
                     <div class="input-group">
@@ -86,6 +66,26 @@ ob_start();
                     </div>
                 </div>
 
+                <div class="form-group">
+                    <label>Name <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-server"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="name" placeholder="Rack name" maxlength="200" value="<?php echo $rack_name; ?>" required autofocus>
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Number of Units <strong class="text-danger">*</strong></label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-up-alt"></i></span>
+                        </div>
+                        <input type="number" class="form-control" name="units" placeholder="Number of Units" min="1" max="70" value="<?php echo $rack_units; ?>" required>
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <label>Model</label>
                     <div class="input-group">
@@ -106,26 +106,6 @@ ob_start();
                     </div>
                 </div>
 
-                <div class="form-group">
-                    <label>Number of Units <strong class="text-danger">*</strong></label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-sort-numeric-up-alt"></i></span>
-                        </div>
-                        <input type="number" class="form-control" name="units" placeholder="Number of Units" min="1" max="70" value="<?php echo $rack_units; ?>" required>
-                    </div>
-                </div>
-
-                <div class="form-group">
-                    <label>Physical Location</label>
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
-                        </div>
-                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200" value="<?php echo $rack_physical_location; ?>">
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <label>Location</label>
                     <div class="input-group">
@@ -148,6 +128,26 @@ ob_start();
                     </div>
                 </div>
 
+                <div class="form-group">
+                    <label>Physical Location</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="physical_location" placeholder="Physical location eg. Floor 2, Closet B" maxlength="200" value="<?php echo $rack_physical_location; ?>">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label>Description</label>
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
+                        </div>
+                        <input type="text" class="form-control" name="description" placeholder="Description of the rack" value="<?php echo $rack_description; ?>">
+                    </div>
+                </div>
+
             </div>
 
             <div class="tab-pane fade" id="pills-rack-notes<?php echo $rack_id; ?>">