diff --git a/includes/html/print-alert-transports.php b/includes/html/print-alert-transports.php
index 9baa91020c..0b4adc98f3 100644
--- a/includes/html/print-alert-transports.php
+++ b/includes/html/print-alert-transports.php
@@ -13,31 +13,27 @@ $no_refresh = true;
 require_once 'includes/html/modal/edit_alert_transport.inc.php';
 require_once 'includes/html/modal/edit_transport_group.inc.php';
 
+if (Auth::user()->hasGlobalAdmin()) {
+    echo "<button type='button' class='btn btn-primary btn-sm' data-toggle='modal' data-target='#edit-alert-transport'>Create alert transport</button>";
+}
 ?>
-
+<br>
+<br>
 <div class="table-responsive">
     <table class="table table-hover table-condensed">
     <tr>
-        <th>#</th>
         <th>Transport Name</th>
         <th>Transport Type</th>
         <th>Default</th>
         <th>Details</th>
-        <th style="width:126px;">Action</th>
+        <th style="width:136px;">Action</th>
     </tr>
-    <td colspan="6">
 <?php
-if (Auth::user()->hasGlobalAdmin()) {
-    echo "<button type='button' class='btn btn-primary btn-sm' data-toggle='modal' data-target='#edit-alert-transport'><i class='fa fa-plus'></i> Create alert transport</button>";
-}
-
-echo '</td>';
 
 // Iterate through each alert transport
-$query = 'SELECT `transport_id` AS `id`, `transport_name` AS `name`, `transport_type` AS `type`, `is_default`, `transport_config` AS `config` FROM `alert_transports`';
+$query = 'SELECT `transport_id` AS `id`, `transport_name` AS `name`, `transport_type` AS `type`, `is_default`, `transport_config` AS `config` FROM `alert_transports` order by `name`';
 foreach (dbFetchRows($query) as $transport) {
     echo "<tr id=\"alert-transport-{$transport['id']}\">";
-    echo '<td><i>#' . ((int) $transport['id']) . '</i></td>';
     echo '<td>' . $transport['name'] . '</td>';
     echo '<td>' . $transport['type'] . '</td>';
     if ($transport['is_default'] == true) {
@@ -80,9 +76,9 @@ foreach (dbFetchRows($query) as $transport) {
     // Add action buttons for admin users only
     if (Auth::user()->hasGlobalAdmin()) {
         echo "<div class='btn-group btn-group-sm' role='group'>";
-        echo "<button type='button' class='btn btn-primary' data-toggle='modal' data-target='#edit-alert-transport' data-transport_id='" . $transport['id'] . "' name='edit-alert-rule' data-container='body' data-toggle='popover' data-content='Edit transport'><i class='fa fa-lg fa-pencil' aria-hidden='true'></i></button> ";
-        echo "<button type='button' class='btn btn-danger' aria-label='Delete' data-toggle='modal' data-target='#delete-alert-transport' data-transport_id='" . $transport['id'] . "' name='delete-alert-transport' data-container='body' data-toggle='popover' data-content='Delete transport'><i class='fa fa-lg fa-trash' aria-hidden='true'></i></button>";
-        echo "<button type='button' class='btn btn-warning' data-transport_id='" . $transport['id'] . "' data-transport='{$transport['type']}' name='test-transport' id='test-transport' data-toggle='popover' data-content='Test transport'><i class='fa fa-lg fa-check' aria-hidden='true'></i></button> ";
+        echo "<button type='button' class='btn btn-primary btn-sm' data-toggle='modal' data-target='#edit-alert-transport' data-transport_id='" . $transport['id'] . "' name='edit-alert-rule' data-container='body' data-toggle='popover' data-content='Edit transport'><i class='fa fa-lg fa-pencil' aria-hidden='true'></i></button> ";
+        echo "<button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#delete-alert-transport' data-transport_id='" . $transport['id'] . "' name='delete-alert-transport' data-container='body' data-toggle='popover' data-content='Delete transport'><i class='fa fa-lg fa-trash' aria-hidden='true'></i></button>";
+        echo "<button type='button' class='btn btn-warning btn-sm' data-transport_id='" . $transport['id'] . "' data-transport='{$transport['type']}' name='test-transport' id='test-transport' data-toggle='popover' data-content='Test transport'><i class='fa fa-lg fa-check' aria-hidden='true'></i></button> ";
         echo '</div>';
     }
     echo '</td>';
@@ -91,33 +87,33 @@ foreach (dbFetchRows($query) as $transport) {
 ?>
     </table>
 </div>
+<br>
+<?php
+if (Auth::user()->hasGlobalAdmin()) {
+    echo "<button type='button' class='btn btn-primary btn-sm' data-toggle='modal' data-target='#edit-transport-group'>Create transport group</button>";
+}
+?>
+
+<br>
+<br>
 <div class="table-responsive">
     <table class="table table-hover table-condensed">
     <tr>
-    <th>#</th>
     <th>Transport Group</th>
-    <th>Size</th>
     <th>Members</th>
-    <th style="width:86px;">Action</th>
+    <th style="width:136px;">Action</th>
     </tr>
-    <td colspan="5">
 <?php
-if (Auth::user()->hasGlobalAdmin()) {
-    echo "<button type='button' class='btn btn-primary btn-sm' data-toggle='modal' data-target='#edit-transport-group'><i class='fa fa-plus'></i> Create transport group</button>";
-}
-echo '</td>';
 
 //Iterate through alert groups
-$query = 'SELECT `transport_group_id` AS `id`, `transport_group_name` AS `name` FROM `alert_transport_groups`';
+$query = 'SELECT `transport_group_id` AS `id`, `transport_group_name` AS `name` FROM `alert_transport_groups` order by `name`';
 foreach (dbFetchRows($query) as $group) {
     echo "<tr id=\"alert-transport-group-{$group['id']}\">";
-    echo '<td><i>#' . ((int) $group['id']) . '</i></td>';
     echo '<td>' . $group['name'] . '</td>';
 
     //List out the members of each group
-    $query = 'SELECT `transport_type`, `transport_name` FROM `transport_group_transport` AS `a` LEFT JOIN `alert_transports` AS `b` ON `a`.`transport_id`=`b`.`transport_id` WHERE `transport_group_id`=?';
+    $query = 'SELECT `transport_type`, `transport_name` FROM `transport_group_transport` AS `a` LEFT JOIN `alert_transports` AS `b` ON `a`.`transport_id`=`b`.`transport_id` WHERE `transport_group_id`=? order by `transport_name`';
     $members = dbFetchRows($query, [$group['id']]);
-    echo '<td>' . sizeof($members) . '</td>';
     echo '<td>';
     foreach ($members as $member) {
         echo '<i>' . ucfirst($member['transport_type']) . ': ' . $member['transport_name'] . '<br /></i>';
@@ -126,8 +122,8 @@ foreach (dbFetchRows($query) as $group) {
     echo '<td>';
     if (Auth::user()->hasGlobalAdmin()) {
         echo "<div class='btn-group btn-group-sm' role='group'>";
-        echo "<button type='button' class='btn btn-primary' data-toggle='modal' data-target='#edit-transport-group' data-group_id='" . $group['id'] . "' data-container='body' data-toggle='popover' data-content='Edit transport group'><i class='fa fa-lg fa-pencil' aria-hidden='true'></i></button> ";
-        echo "<button type='button' class='btn btn-danger' aria-label='Delete' data-toggle='modal' data-target='#delete-transport-group' data-group_id='" . $group['id'] . "' data-container='body' data-toggle='popover' data-content='Delete transport group'><i class='fa fa-lg fa-trash' aria-hidden='true'></i></button>";
+        echo "<button type='button' class='btn btn-primary btn-sm' data-toggle='modal' data-target='#edit-transport-group' data-group_id='" . $group['id'] . "' data-container='body' data-toggle='popover' data-content='Edit transport group'><i class='fa fa-lg fa-pencil' aria-hidden='true'></i></button> ";
+        echo "<button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#delete-transport-group' data-group_id='" . $group['id'] . "' data-container='body' data-toggle='popover' data-content='Delete transport group'><i class='fa fa-lg fa-trash' aria-hidden='true'></i></button>";
         echo '</div>';
     }
     echo '</td>';