diff --git a/agent/modals/software/software_add.php b/agent/modals/software/software_add.php
index 3f525517..b5fc1040 100644
--- a/agent/modals/software/software_add.php
+++ b/agent/modals/software/software_add.php
@@ -71,6 +71,21 @@ ob_start();
 
                 <?php } ?>
 
+                <div class="form-group">
+                    <label>Type <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-tag"></i></span>
+                        </div>
+                        <select class="form-control select2" name="type" required>
+                            <option value="">- Select Type -</option>
+                            <?php foreach ($software_types_array as $software_type) { ?>
+                                <option><?php echo $software_type; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <label>Software Name <strong class="text-danger">*</strong></label>
                     <div class="input-group">
@@ -91,16 +106,6 @@ ob_start();
                     </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="Short description">
-                    </div>
-                </div>
-
                 <?php if ($client_id) { ?>
                 <div class="form-group">
                     <label>Vendor</label>
@@ -125,17 +130,12 @@ ob_start();
                 <?php } ?>
 
                 <div class="form-group">
-                    <label>Type <strong class="text-danger">*</strong></label>
+                    <label>Description</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
                         </div>
-                        <select class="form-control select2" name="type" required>
-                            <option value="">- Select Type -</option>
-                            <?php foreach ($software_types_array as $software_type) { ?>
-                                <option><?php echo $software_type; ?></option>
-                            <?php } ?>
-                        </select>
+                        <input type="text" class="form-control" name="description" placeholder="Short description">
                     </div>
                 </div>
 
diff --git a/agent/modals/software/software_edit.php b/agent/modals/software/software_edit.php
index bb7624aa..401d71f6 100644
--- a/agent/modals/software/software_edit.php
+++ b/agent/modals/software/software_edit.php
@@ -79,6 +79,20 @@ ob_start();
 
             <div class="tab-pane fade show active" id="pills-details<?php echo $software_id; ?>">
 
+                <div class="form-group">
+                    <label>Type <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-tag"></i></span>
+                        </div>
+                        <select class="form-control select2" name="type" required>
+                            <?php foreach($software_types_array as $software_type_select) { ?>
+                                <option <?php if ($software_type == $software_type_select) { echo "selected"; } ?>><?php echo $software_type_select; ?></option>
+                            <?php } ?>
+                        </select>
+                    </div>
+                </div>
+
                 <div class="form-group">
                     <label>Software Name <strong class="text-danger">*</strong></label>
                     <div class="input-group">
@@ -99,16 +113,6 @@ ob_start();
                     </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="Short description" value="<?php echo $software_description; ?>">
-                    </div>
-                </div>
-
                 <div class="form-group">
                     <label>Vendor</label>
                     <div class="input-group">
@@ -132,16 +136,12 @@ ob_start();
                 </div>
 
                 <div class="form-group">
-                    <label>Type <strong class="text-danger">*</strong></label>
+                    <label>Description</label>
                     <div class="input-group">
                         <div class="input-group-prepend">
-                            <span class="input-group-text"><i class="fa fa-fw fa-tag"></i></span>
+                            <span class="input-group-text"><i class="fa fa-fw fa-align-left"></i></span>
                         </div>
-                        <select class="form-control select2" name="type" required>
-                            <?php foreach($software_types_array as $software_type_select) { ?>
-                                <option <?php if ($software_type == $software_type_select) { echo "selected"; } ?>><?php echo $software_type_select; ?></option>
-                            <?php } ?>
-                        </select>
+                        <input type="text" class="form-control" name="description" placeholder="Short description" value="<?php echo $software_description; ?>">
                     </div>
                 </div>