diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index 78d0873828a..f01ac05a446 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -141,22 +141,10 @@
     </Interfaces>
     <Firewall order="3" cssClass="glyphicon glyphicon-fire">
         <Aliases order="10" cssClass="fa fa-list-alt fa-fw">
-            <All order="100"  url="/firewall_aliases.php?tab=all">
-                <Edit url="/firewall_aliases_edit.php?tab=all" visibility="hidden"/>
-                <Network url="/firewall_aliases.php?tab=network" visibility="hidden"/>
-                <NoneEdit url="/firewall_aliases_edit.php?id=*" visibility="hidden"/>
-                <None url="/firewall_aliases.php" visibility="hidden"/>
-            </All>
-            <IPs order="200" url="/firewall_aliases.php?tab=ip">
-                <Edit url="/firewall_aliases_edit.php?tab=ip" visibility="hidden"/>
-            </IPs>
-            <Ports order="300" url="/firewall_aliases.php?tab=port">
-                <Edit url="/firewall_aliases_edit.php?tab=port" visibility="hidden"/>
-            </Ports>
-            <URLs order="400"  url="/firewall_aliases.php?tab=url">
-                <Edit url="/firewall_aliases_edit.php?tab=url" visibility="hidden"/>
-            </URLs>
-            <Import order="500" url="/firewall_aliases_import.php"/>
+            <View order="100"  url="/firewall_aliases.php">
+                <Edit url="/firewall_aliases_edit.php*" visibility="hidden"/>
+            </View>
+            <Import order="200" url="/firewall_aliases_import.php"/>
         </Aliases>
         <Rules order="20" url="/firewall_rules.php" cssClass="fa fa-check fa-fw">
             <RulesEdit url="/firewall_rules_edit.php*" visibility="hidden"/>
diff --git a/src/www/firewall_aliases.php b/src/www/firewall_aliases.php
index f056bc2d883..298a49b9346 100644
--- a/src/www/firewall_aliases.php
+++ b/src/www/firewall_aliases.php
@@ -31,6 +31,25 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 
+function find_alias_type($type)
+{
+    $types = array(
+        'host' => gettext('Host(s)'),
+        'network' => gettext('Network(s)'),
+        'port' => gettext('Port(s)'),
+        'url' => gettext('URL (IPs)'),
+        'url_ports' => gettext('URL (Ports)'),
+        'urltable' => gettext('URL Table (IPs)'),
+        'urltable_ports' => gettext('URL Table (Ports)'),
+    );
+
+    if (isset($types[$type])) {
+        return $types[$type];
+    }
+
+    return $type;
+}
+
 function find_alias_reference($section, $field, $origname, &$is_alias_referenced, &$referenced_by) {
     global $config;
     if(!$origname || $is_alias_referenced)
@@ -75,9 +94,6 @@ function find_alias_reference($section, $field, $origname, &$is_alias_referenced
 }
 $a_aliases = &$config['aliases']['alias'];
 
-// determine selected tab
-$selected_tab = htmlspecialchars(($_REQUEST['tab'] == "" ? "ip" : preg_replace("/\W/","",$_REQUEST['tab'])));
-
 if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     if (isset($_POST['apply'])) {
         /* reload all components that use aliases */
@@ -128,7 +144,7 @@ function find_alias_reference($section, $field, $origname, &$is_alias_referenced
                     filter_configure();
                     mark_subsystem_dirty('aliases');
                 }
-                header("Location: firewall_aliases.php?tab=" . $selected_tab);
+                header('Location: firewall_aliases.php');
                 exit;
             }
         }
@@ -137,7 +153,7 @@ function find_alias_reference($section, $field, $origname, &$is_alias_referenced
 
 legacy_html_escape_form_data($a_aliases);
 $main_buttons = array(
-    array('href'=>'firewall_aliases_edit.php?tab='.$selected_tab, 'label'=>gettext("Add a new alias")),
+    array('href' => 'firewall_aliases_edit.php', 'label' => gettext('Add a new alias')),
 );
 
 include("head.inc");
@@ -186,37 +202,18 @@ function find_alias_reference($section, $field, $origname, &$is_alias_referenced
                   <table class="table table-striped">
                     <tr>
                       <td><?=gettext("Name"); ?></td>
-                      <td><?=gettext("Values"); ?></td>
+                      <td><?=gettext("Type"); ?></td>
                       <td><?=gettext("Description"); ?></td>
+                      <td><?=gettext("Values"); ?></td>
                       <td>&nbsp;</td>
                     </tr>
 <?php
-                    uasort($a_aliases, function($a, $b){
+                    uasort($a_aliases, function($a, $b) {
                         return strnatcmp($a['name'], $b['name']);
                     });
+
                     foreach ($a_aliases as $i=> $alias){
-                      $show_alias = false;
-                      switch ($selected_tab){
-                      case "all":
-                        $show_alias= true;
-                        break;
-                      case "ip":
-                      case "host":
-                      case "network":
-                        if (preg_match("/(host|network)/",$alias["type"]))
-                          $show_alias= true;
-                        break;
-                      case "url":
-                        if (preg_match("/(url)/i",$alias["type"]))
-                          $show_alias= true;
-                        break;
-                      case "port":
-                        if($alias["type"] == "port")
-                          $show_alias= true;
-                        break;
-                      }
-                      if ($show_alias ){
-                    ?>
+?>
                     <tr>
                       <td ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';">
                         <?=$alias['name'];?>
@@ -238,10 +235,13 @@ function find_alias_reference($section, $field, $origname, &$is_alias_referenced
                       }
 ?>
                       <td ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';">
-                        <?=$alias_values; ?>
+                        <?= find_alias_type($alias['type']) ?>
+                      </td>
+                      <td ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';">
+                        <?= $alias['descr'] ?>
                       </td>
                       <td ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';">
-                        <?=$alias['descr'];?>
+                        <?= $alias_values ?>
                       </td>
                       <td>
                         <a href="firewall_aliases_edit.php?id=<?=$i;?>" title="<?=gettext("Edit alias"); ?>" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
@@ -249,17 +249,14 @@ function find_alias_reference($section, $field, $origname, &$is_alias_referenced
                       </td>
                     </tr>
 <?php
-                      } // if ($show_alias)
                     } // foreach
 ?>
+                  <tr>
+                    <td colspan="5">
+                      <?=gettext("Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number of changes that have to be made if a host, network or port changes. You can enter the name of an alias instead of the host, network or port in all fields that have a red background. The alias will be resolved according to the list above. If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped."); ?>
+                    </td>
+                  </tr>
                 </table>
-                <div class="container-fluid">
-                  <span class="text-danger">
-                    <strong><?=gettext("Note:"); ?><br />
-                    </strong></span>
-                  </span>
-                  <?=gettext("Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number of changes that have to be made if a host, network or port changes. You can enter the name of an alias instead of the host, network or port in all fields that have a red background. The alias will be resolved according to the list above. If an alias cannot be resolved (e.g. because you deleted it), the corresponding element (e.g. filter/NAT/shaper rule) will be considered invalid and skipped."); ?>
-                </div>
             </form>
           </div>
         </section>
diff --git a/src/www/firewall_aliases_edit.php b/src/www/firewall_aliases_edit.php
index ac10ba5a0b3..30c8bee0e88 100644
--- a/src/www/firewall_aliases_edit.php
+++ b/src/www/firewall_aliases_edit.php
@@ -230,15 +230,8 @@
               }
             }
 
-            if($pconfig['type'] == 'host') {
-                header("Location: firewall_aliases.php?tab=ip");
-            } elseif (strpos($pconfig['type'],'url') !== false) {
-                header("Location: firewall_aliases.php?tab=url");
-            } else {
-                header("Location: firewall_aliases.php?tab=".$pconfig['type']);
-            }
+            header('Location: firewall_aliases.php');
             exit;
-
         }
     }
 }
@@ -357,174 +350,168 @@ function toggleType() {
       <div class="row">
 <?php  if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
         <section class="col-xs-12">
-          <div class="content-box">
-            <header class="content-box-head container-fluid">
-              <h3><?=gettext("Alias Edit");?></h3>
-            </header>
-            <div class="content-box-main">
-              <form action="firewall_aliases_edit.php" method="post" name="iform" id="iform">
-                <div class="table-responsive">
-                  <table class="table table-striped">
-                    <tr>
-                      <td colspan="2" align="right">
-                        <small><?=gettext("full help"); ?> </small>
-                        <i class="fa fa-toggle-off text-danger"  style="cursor: pointer;" id="show_all_help_page" type="button"></i>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td width="22%"><a id="help_for_name" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Name"); ?></td>
-                      <td width="78%">
-                        <input name="origname" type="hidden" id="origname" class="form-control unknown" size="40" value="<?=$pconfig['name'];?>" />
-                        <?php if (isset($id)): ?>
-                          <input name="id" type="hidden" value="<?=$id;?>" />
-                        <?php endif; ?>
-                        <input name="name" type="text" id="name" class="form-control unknown" size="40" maxlength="31" value="<?=$pconfig['name'];?>" />
-                        <div class="hidden" for="help_for_name">
-                          <?=gettext("The name of the alias may only consist of the characters \"a-z, A-Z, 0-9 and _\"."); ?>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td><a id="help_for_description" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description"); ?></td>
-                      <td>
-                        <input name="descr" type="text" class="form-control unknown" id="descr" size="40" value="<?=$pconfig['descr'];?>" />
-                        <div class="hidden" for="help_for_description">
-                          <?=gettext("You may enter a description here for your reference (not parsed)."); ?>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td><a id="help_for_type" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Type"); ?></td>
-                      <td>
-                        <select  name="type" class="form-control" id="typeSelect">
-                          <option value="host" <?=$pconfig['type'] == "host" ? "selected=\"selected\"" : ""; ?>><?=gettext("Host(s)"); ?></option>
-                          <option value="network" <?=$pconfig['type'] == "network" ? "selected=\"selected\"" : ""; ?>><?=gettext("Network(s)"); ?></option>
-                          <option value="port" <?=$pconfig['type'] == "port" ? "selected=\"selected\"" : ""; ?>><?=gettext("Port(s)"); ?></option>
-                          <option value="url" <?=$pconfig['type'] == "url" ? "selected=\"selected\"" : ""; ?>><?=gettext("URL (IPs)");?></option>
-                          <option value="url_ports" <?=$pconfig['type'] == "url_ports" ? "selected=\"selected\"" : ""; ?>><?=gettext("URL (Ports)");?></option>
-                          <option value="urltable" <?=$pconfig['type'] == "urltable" ? "selected=\"selected\"" : ""; ?>><?=gettext("URL Table (IPs)"); ?></option>
-                          <option value="urltable_ports" <?=$pconfig['type'] == "urltable_ports" ? "selected=\"selected\"" : ""; ?>><?=gettext("URL Table (Ports)"); ?></option>
-                        </select>
-                        <div class="hidden" for="help_for_type">
-                          <span class="text-info">
-                            <?=gettext("Networks")?><br/>
-                          </span>
-                          <small>
-                            <?=gettext("Networks are specified in CIDR format.  Select the CIDR mask that pertains to each entry. /32 specifies a single IPv4 host, /128 specifies a single IPv6 host, /24 specifies 255.255.255.0, /64 specifies a normal IPv6 network, etc. Hostnames (FQDNs) may also be specified, using a /32 mask for IPv4 or /128 for IPv6.");?>
-                            <br/>
-                          </small>
-                          <span class="text-info">
-                            <?=gettext("Hosts")?><br/>
-                          </span>
-                          <small>
-                            <?=gettext("Enter as many hosts as you would like. Hosts must be specified by their IP address or fully qualified domain name (FQDN). FQDN hostnames are periodically re-resolved and updated. If multiple IPs are returned by a DNS query, all are used.");?>
-                            <br/>
-                          </small>
-                          <span class="text-info">
-                            <?=gettext("Ports")?><br/>
-                          </span>
-                          <small>
-                            <?=gettext("Enter as many ports as you wish. Port ranges can be expressed by separating with a colon.");?>
-                            <br/>
-                          </small>
-                          <span class="text-info">
-                            <?=gettext("URL's")?><br/>
-                          </span>
-                          <small>
-                            <?=gettext("Enter a URL containing a large number of IPs,ports and/or Subnets. After saving the lists will be downloaded and scheduled for automatic updates when a frequency is provided.");?>
-                          </small>
-                        </div>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td><div id="addressnetworkport"><a id="help_for_hosts" href="#" class="showhelp"><i class="fa fa-info-circle text-muted"></i></a> <?=gettext("Host(s)"); ?></div></td>
-                      <td>
-                        <table class="table table-striped table-condensed" id="detailTable">
-                          <thead>
-                            <tr>
-                              <th></th>
-                              <th id="detailsHeading1"><?=gettext("Network"); ?></th>
-                              <th id="detailsHeading3"><?=gettext("Description"); ?></th>
-                              <th id="updatefreqHeader" ><?=gettext("Update Freq. (days)");?></th>
-                            </tr>
-                          </thead>
-                          <tbody>
+          <div class="content-box tab-content">
+            <form action="firewall_aliases_edit.php" method="post" name="iform" id="iform">
+              <table class="table table-striped">
+                <tr>
+                  <td width="22%"><strong><?=gettext("Alias Edit");?></strong></td>
+                  <td width="78%" align="right">
+                    <small><?=gettext("full help"); ?> </small>
+                    <i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page" type="button"></i>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="22%"><a id="help_for_name" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Name"); ?></td>
+                  <td width="78%">
+                    <input name="origname" type="hidden" id="origname" class="form-control unknown" size="40" value="<?=$pconfig['name'];?>" />
+                    <?php if (isset($id)): ?>
+                      <input name="id" type="hidden" value="<?=$id;?>" />
+                    <?php endif; ?>
+                    <input name="name" type="text" id="name" class="form-control unknown" size="40" maxlength="31" value="<?=$pconfig['name'];?>" />
+                    <div class="hidden" for="help_for_name">
+                      <?=gettext("The name of the alias may only consist of the characters \"a-z, A-Z, 0-9 and _\"."); ?>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td><a id="help_for_description" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description"); ?></td>
+                  <td>
+                    <input name="descr" type="text" class="form-control unknown" id="descr" size="40" value="<?=$pconfig['descr'];?>" />
+                    <div class="hidden" for="help_for_description">
+                      <?=gettext("You may enter a description here for your reference (not parsed)."); ?>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td><a id="help_for_type" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Type"); ?></td>
+                  <td>
+                    <select  name="type" class="form-control" id="typeSelect">
+                      <option value="host" <?=$pconfig['type'] == "host" ? "selected=\"selected\"" : ""; ?>><?=gettext("Host(s)"); ?></option>
+                      <option value="network" <?=$pconfig['type'] == "network" ? "selected=\"selected\"" : ""; ?>><?=gettext("Network(s)"); ?></option>
+                      <option value="port" <?=$pconfig['type'] == "port" ? "selected=\"selected\"" : ""; ?>><?=gettext("Port(s)"); ?></option>
+                      <option value="url" <?=$pconfig['type'] == "url" ? "selected=\"selected\"" : ""; ?>><?=gettext("URL (IPs)");?></option>
+                      <option value="url_ports" <?=$pconfig['type'] == "url_ports" ? "selected=\"selected\"" : ""; ?>><?=gettext("URL (Ports)");?></option>
+                      <option value="urltable" <?=$pconfig['type'] == "urltable" ? "selected=\"selected\"" : ""; ?>><?=gettext("URL Table (IPs)"); ?></option>
+                      <option value="urltable_ports" <?=$pconfig['type'] == "urltable_ports" ? "selected=\"selected\"" : ""; ?>><?=gettext("URL Table (Ports)"); ?></option>
+                    </select>
+                    <div class="hidden" for="help_for_type">
+                      <span class="text-info">
+                        <?=gettext("Networks")?><br/>
+                      </span>
+                      <small>
+                        <?=gettext("Networks are specified in CIDR format.  Select the CIDR mask that pertains to each entry. /32 specifies a single IPv4 host, /128 specifies a single IPv6 host, /24 specifies 255.255.255.0, /64 specifies a normal IPv6 network, etc. Hostnames (FQDNs) may also be specified, using a /32 mask for IPv4 or /128 for IPv6.");?>
+                        <br/>
+                      </small>
+                      <span class="text-info">
+                        <?=gettext("Hosts")?><br/>
+                      </span>
+                      <small>
+                        <?=gettext("Enter as many hosts as you would like. Hosts must be specified by their IP address or fully qualified domain name (FQDN). FQDN hostnames are periodically re-resolved and updated. If multiple IPs are returned by a DNS query, all are used.");?>
+                        <br/>
+                      </small>
+                      <span class="text-info">
+                        <?=gettext("Ports")?><br/>
+                      </span>
+                      <small>
+                        <?=gettext("Enter as many ports as you wish. Port ranges can be expressed by separating with a colon.");?>
+                        <br/>
+                      </small>
+                      <span class="text-info">
+                        <?=gettext("URL's")?><br/>
+                      </span>
+                      <small>
+                        <?=gettext("Enter a URL containing a large number of IPs,ports and/or Subnets. After saving the lists will be downloaded and scheduled for automatic updates when a frequency is provided.");?>
+                      </small>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td><div id="addressnetworkport"><a id="help_for_hosts" href="#" class="showhelp"><i class="fa fa-info-circle text-muted"></i></a> <?=gettext("Host(s)"); ?></div></td>
+                  <td>
+                    <table class="table table-striped table-condensed" id="detailTable">
+                      <thead>
+                        <tr>
+                          <th></th>
+                          <th id="detailsHeading1"><?=gettext("Network"); ?></th>
+                          <th id="detailsHeading3"><?=gettext("Description"); ?></th>
+                          <th id="updatefreqHeader" ><?=gettext("Update Freq. (days)");?></th>
+                        </tr>
+                      </thead>
+                      <tbody>
 <?php                      if (is_array($pconfig['aliasurl'])):
-                            $detail_desc = explode("||", $pconfig['detail']);
-                            foreach ($pconfig['aliasurl'] as $aliasid => $aliasurl):
+                        $detail_desc = explode("||", $pconfig['detail']);
+                        foreach ($pconfig['aliasurl'] as $aliasid => $aliasurl):
 ?>
-                              <tr>
-                                <td>
-                                  <div style="cursor:pointer;" class="act-removerow btn btn-default btn-xs" alt="remove"><span class="glyphicon glyphicon-minus"></span></div>
-                                </td>
-                                <td>
-                                  <input type="text" class="form-control" name="host_url[]" value="<?=$aliasurl;?>"/>
-                                </td>
-                                <td>
-                                  <input type="text" class="form-control" name="detail[]" value="<?= isset($detail_desc[$aliasid])?$detail_desc[$aliasid]:"";?>">
-                                </td>
-                                <td>
+                        <tr>
+                          <td>
+                            <div style="cursor:pointer;" class="act-removerow btn btn-default btn-xs" alt="remove"><span class="glyphicon glyphicon-minus"></span></div>
+                          </td>
+                          <td>
+                            <input type="text" class="form-control" name="host_url[]" value="<?=$aliasurl;?>"/>
+                          </td>
+                          <td>
+                            <input type="text" class="form-control" name="detail[]" value="<?= isset($detail_desc[$aliasid])?$detail_desc[$aliasid]:"";?>">
+                          </td>
+                          <td>
 <?php                          if ($aliasid ==0):
 ?>
-                                  <input type="text" class="form-control input-sm" id="updatefreq"  name="updatefreq" value="<?=$pconfig['updatefreq'];?>" >
+                            <input type="text" class="form-control input-sm" id="updatefreq"  name="updatefreq" value="<?=$pconfig['updatefreq'];?>" >
 <?php                          endif;
 ?>
-                                </td>
-                              </tr>
+                          </td>
+                        </tr>
 <?php                        endforeach;
-                          else:
-                            $detail_desc = explode("||", $pconfig['detail']);
-                            if (empty($pconfig['address']) && isset($pconfig['url'])) {
-                              $addresslst = array($pconfig['url']);
-                            } else {
-                              $addresslst = explode(' ', $pconfig['address']);
-                            }
-                            foreach ($addresslst as $addressid => $address):
+                      else:
+                        $detail_desc = explode("||", $pconfig['detail']);
+                        if (empty($pconfig['address']) && isset($pconfig['url'])) {
+                          $addresslst = array($pconfig['url']);
+                        } else {
+                          $addresslst = explode(' ', $pconfig['address']);
+                        }
+                        foreach ($addresslst as $addressid => $address):
 ?>
-                              <tr>
-                                <td>
-                                  <div style="cursor:pointer;" class="act-removerow btn btn-default btn-xs" alt="remove"><span class="glyphicon glyphicon-minus"></span></div>
-                                </td>
-                                <td>
-                                  <input type="text" class="fld_detail"  name="host_url[]" value="<?=$address;?>"/>
-                                </td>
-                                <td>
-                                  <input type="text" name="detail[]" value="<?= isset($detail_desc[$addressid])?$detail_desc[$addressid]:"";?>"/>
-                                </td>
-                                <td>
+                        <tr>
+                          <td>
+                            <div style="cursor:pointer;" class="act-removerow btn btn-default btn-xs" alt="remove"><span class="glyphicon glyphicon-minus"></span></div>
+                          </td>
+                          <td>
+                            <input type="text" class="fld_detail"  name="host_url[]" value="<?=$address;?>"/>
+                          </td>
+                          <td>
+                            <input type="text" name="detail[]" value="<?= isset($detail_desc[$addressid])?$detail_desc[$addressid]:"";?>"/>
+                          </td>
+                          <td>
 <?php                          if ($addressid ==0):
 ?>
-                                  <input type="text" class="input-sm" id="updatefreq" name="updatefreq" value="<?=$pconfig['updatefreq'];?>"/>
+                            <input type="text" class="input-sm" id="updatefreq" name="updatefreq" value="<?=$pconfig['updatefreq'];?>"/>
 <?php                          endif;
 ?>
-                                </td>
-                              </tr>
+                          </td>
+                        </tr>
 
 <?php                      endforeach;
-                          endif;
+                      endif;
 ?>
-                            </tbody>
-                            <tfoot>
-                              <tr>
-                                <td colspan="4">
-                                  <div id="addNew" style="cursor:pointer;" class="btn btn-default btn-xs" alt="add"><span class="glyphicon glyphicon-plus"></span></div>
-                                </td>
-                              </tr>
-                            </tfoot>
-                          </table>
-                        </td>
-                      </tr>
-                      <tr>
-                        <td>&nbsp;</td>
-                        <td>
-                          <input id="submit" name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
-                          <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
-                        </td>
-                      </tr>
-                  </table>
-                </div>
-              </form>
-            </div>
+                      </tbody>
+                      <tfoot>
+                        <tr>
+                          <td colspan="4">
+                            <div id="addNew" style="cursor:pointer;" class="btn btn-default btn-xs" alt="add"><span class="glyphicon glyphicon-plus"></span></div>
+                          </td>
+                        </tr>
+                      </tfoot>
+                    </table>
+                  </td>
+                </tr>
+                <tr>
+                  <td>&nbsp;</td>
+                  <td>
+                    <input id="submit" name="submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
+                    <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" />
+                  </td>
+                </tr>
+              </table>
+            </form>
           </div>
         </section>
       </div>
diff --git a/src/www/firewall_aliases_import.php b/src/www/firewall_aliases_import.php
index fe2649f8c65..ff6aff790e6 100644
--- a/src/www/firewall_aliases_import.php
+++ b/src/www/firewall_aliases_import.php
@@ -153,67 +153,63 @@
       <div class="row">
 <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
         <section class="col-xs-12">
-          <div class="content-box">
-            <header class="content-box-head container-fluid">
-          <h3><?=gettext("Alias Import");?></h3>
-            </header>
-            <div class="content-box-main">
-              <form action="firewall_aliases_import.php" method="post" name="iform">
-                <table class="table table-striped">
-                  <tr>
-                    <td colspan="2" align="right">
-                      <small><?=gettext("full help"); ?> </small>
-                      <i class="fa fa-toggle-off text-danger"  style="cursor: pointer;" id="show_all_help_page" type="button"></i>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td  width="22%"><a id="help_for_name" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Alias Name"); ?></td>
-                    <td  width="78%">
-                      <input name="name" type="text" class="form-control unknown" size="40" maxlength="31" value="<?=$pconfig['name'];?>" />
-                      <div class="hidden" for="help_for_name">
-                        <?=gettext("The name of the alias may only consist of the characters \"a-z, A-Z and 0-9\"."); ?>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td><a id="help_for_description" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description"); ?></td>
-                    <td>
-                      <input name="descr" type="text" value="<?=$pconfig['descr'];?>" />
-                      <div class="hidden" for="help_for_description">
-                        <?=gettext("You may enter a description here for your reference (not parsed)"); ?>.
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td><a id="help_for_alias" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Aliases to import"); ?></td>
-                    <td>
-                      <textarea name="aliasimport" rows="15" cols="40"><?=$pconfig['aliasimport'];?></textarea>
-                      <div class="hidden" for="help_for_alias">
-                        <?=gettext("Paste in the aliases to import separated by a carriage return. Common examples are lists of IPs, networks, blacklists, etc."); ?>
-                        <br />
-                        <?=gettext("The list may contain IP addresses, with or without CIDR prefix, IP ranges, blank lines (ignored) and an optional description after each IP. e.g.:"); ?>
-                        <code>
-                          <br/>172.16.1.2
-                          <br/>172.16.0.0/24
-                          <br/>10.11.12.100-10.11.12.200
-                          <br/>192.168.1.254 Home router
-                          <br/>10.20.0.0/16 Office network
-                          <br/>10.40.1.10-10.40.1.19 Managed switches
-                        </code>
-                      </div>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>&nbsp;</td>
-                    <td>
-                      <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
-                      <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>"
-                             onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/firewall_aliases.php');?>'" />
-                    </td>
-                  </tr>
-                </table>
-              </form>
-            </div>
+          <div class="content-box tab-content">
+            <form action="firewall_aliases_import.php" method="post" name="iform">
+              <table class="table table-striped">
+                <tr>
+                  <td width="22%"><strong><?=gettext("Alias Import");?></strong></td>
+                  <td width="78%" align="right">
+                    <small><?=gettext("full help"); ?> </small>
+                    <i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page" type="button"></i>
+                  </td>
+                </tr>
+                <tr>
+                  <td  width="22%"><a id="help_for_name" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Alias Name"); ?></td>
+                  <td  width="78%">
+                    <input name="name" type="text" class="form-control unknown" size="40" maxlength="31" value="<?=$pconfig['name'];?>" />
+                    <div class="hidden" for="help_for_name">
+                      <?=gettext("The name of the alias may only consist of the characters \"a-z, A-Z and 0-9\"."); ?>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td><a id="help_for_description" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description"); ?></td>
+                  <td>
+                    <input name="descr" type="text" value="<?=$pconfig['descr'];?>" />
+                    <div class="hidden" for="help_for_description">
+                      <?=gettext("You may enter a description here for your reference (not parsed)"); ?>.
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td><a id="help_for_alias" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Aliases to import"); ?></td>
+                  <td>
+                    <textarea name="aliasimport" rows="15" cols="40"><?=$pconfig['aliasimport'];?></textarea>
+                    <div class="hidden" for="help_for_alias">
+                      <?=gettext("Paste in the aliases to import separated by a carriage return. Common examples are lists of IPs, networks, blacklists, etc."); ?>
+                      <br />
+                      <?=gettext("The list may contain IP addresses, with or without CIDR prefix, IP ranges, blank lines (ignored) and an optional description after each IP. e.g.:"); ?>
+                      <code>
+                        <br/>172.16.1.2
+                        <br/>172.16.0.0/24
+                        <br/>10.11.12.100-10.11.12.200
+                        <br/>192.168.1.254 Home router
+                        <br/>10.20.0.0/16 Office network
+                        <br/>10.40.1.10-10.40.1.19 Managed switches
+                      </code>
+                    </div>
+                  </td>
+                </tr>
+                <tr>
+                  <td>&nbsp;</td>
+                  <td>
+                    <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
+                    <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>"
+                           onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? html_safe($_SERVER['HTTP_REFERER']) : '/firewall_aliases.php');?>'" />
+                  </td>
+                </tr>
+              </table>
+            </form>
           </div>
         </section>
       </div>