diff --git a/application/controllers/Band.php b/application/controllers/Band.php
index 22c3ab3ee..ccde28422 100644
--- a/application/controllers/Band.php
+++ b/application/controllers/Band.php
@@ -20,6 +20,7 @@ class Band extends CI_Controller {
 		$this->load->model('bands');
 
 		$data['bands'] = $this->bands->get_all_bands_for_user();
+		$data['units'] = $this->frequency->QRG_UNITS;
 
 		// Render Page
 		$data['page_title'] = __("Bands");
diff --git a/application/libraries/Frequency.php b/application/libraries/Frequency.php
index 5578f50af..ccd6537a6 100644
--- a/application/libraries/Frequency.php
+++ b/application/libraries/Frequency.php
@@ -1,132 +1,188 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
 class Frequency {
 
-  public $defaultFrequencies = array(
-	'160m'=>array(
-	  	'SSB'=>"1900000",
-  		'DATA'=>"1838000",
-  		'CW'=>"1830000",
-  		'NOMINAL'=>"1.8"),
-	'80m'=>array(
-  		'SSB'=>"3700000",
-  		'DATA'=>"3583000",
-  		"CW"=>"3550000",
-  		"NOMINAL"=>"3.5"),
-	'60m'=>array(
-  		'SSB'=>"5330000",
-  		'DATA'=>"5330000",
-  		"CW"=>"5260000",
-  		"NOMINAL"=>"5"),
-	'40m'=>array(
-  		'SSB'=>"7100000",
-  		'DATA'=>"7040000",
-  		'CW'=>"7020000",
-  		'NOMINAL'=>"7"),
-	'30m'=>array(
-  		'SSB'=>"10120000",
-  		'DATA'=>"10145000",
-  		'CW'=>"10120000",
-  		'NOMINAL'=>"10"),
-	'20m'=>array(
-  		'SSB'=>"14200000",
-  		'DATA'=>"14080000",
-  		'CW'=>"14020000",
-  		'NOMINAL'=>"14"),
-	'17m'=>array(
-  		'SSB'=>"18130000",
-  		'DATA'=>"18105000",
-  		'CW'=>"18080000",
-  		'NOMINAL'=>"18"),
-	'15m'=>array(
-  		'SSB'=>"21300000",
-  		'DATA'=>"21080000",
-  		'CW'=>"21020000",
-  		'NOMINAL'=>"21"),
-	'12m'=>array(
-  		'SSB'=>"24950000",
-  		'DATA'=>"24925000",
-  		'CW'=>"24900000",
-  		'NOMINAL'=>"24"),
-	'10m'=>array(
-  		'SSB'=>"28300000",
-  		'DATA'=>"28120000",
-  		'CW'=>"28050000",
-  		'NOMINAL'=>"28"),
-	'6m'=>array(
-  		'SSB'=>"50150000",
-  		'DATA'=>"50230000",
-  		'CW'=>"50090000",
-  		'NOMINAL'=>"50"),
-	'4m'=>array(
-  		'SSB'=>"70200000",
-  		'DATA'=>"70200000",
-  		'CW'=>"70200000",
-  		'NOMINAL'=>"70"),
-	'2m'=>array(
-  		'SSB'=>"144300000",
-  		'DATA'=>"144370000",
-  		'CW'=>"144050000",
-  		'NOMINAL'=>"144"),
-	'1.25m'=>array(
-		'SSB'=>"222100000",
-		'DATA'=>"222100000",
-		'CW'=>"222100000",
-		'NOMINAL'=>"222"),
-	'70cm'=>array(
-  		'SSB'=>"432200000",
-  		'DATA'=>"432088000",
-  		'CW'=>"432050000",
-  		'NOMINAL'=>"433"),
-	'33cm'=>array(
-		'SSB'=>"902100000",
-		'DATA'=>"902100000",
-		'CW'=>"902100000",
-		'NOMINAL'=>"902"),
-	'23cm'=>array(
-  		'SSB'=>"1296000000",
-  		'DATA'=>"1296138000",
-  		'CW'=>"129600000",
-  		'NOMINAL'=>"1296"),
-	'13cm'=>array(
-  		'SSB'=>"2320800000",
-  		'DATA'=>"2320800000",
-  		'CW'=>"2320800000",
-  		'NOMINAL'=>"2400"),
-	'9cm'=>array(
-  		'SSB'=>"3410000000",
-  		'DATA'=>"3410000000",
-  		'CW'=>"3400000000",
-  		'NOMINAL'=>"3400"),
-	'6cm'=>array(
-  		'SSB'=>"5670000000",
-  		'DATA'=>"5670000000",
-  		'CW'=>"5670000000",
-  		'NOMINAL'=>"5670"),
-	'3cm'=>array(
-  		'SSB'=>"10225000000",
-  		'DATA'=>"10225000000",
-  		'CW'=>"10225000000",
-  		'NOMINAL'=>"10225")
-  );
+	public $QRG_UNITS = [
+		'Hz',
+		'kHz',
+		'MHz',
+		'GHz'
+	];
+
+	public $defaultFrequencies = array(
+		'160m' => array(
+			'SSB' => "1900000",
+			'DATA' => "1838000",
+			'CW' => "1830000",
+			'NOMINAL' => "1.8",
+			'UNIT' => 'kHz'
+		),
+		'80m' => array(
+			'SSB' => "3700000",
+			'DATA' => "3583000",
+			"CW" => "3550000",
+			"NOMINAL" => "3.5",
+			'UNIT' => 'kHz'
+		),
+		'60m' => array(
+			'SSB' => "5330000",
+			'DATA' => "5330000",
+			"CW" => "5260000",
+			"NOMINAL" => "5",
+			'UNIT' => 'kHz'
+		),
+		'40m' => array(
+			'SSB' => "7100000",
+			'DATA' => "7040000",
+			'CW' => "7020000",
+			'NOMINAL' => "7",
+			'UNIT' => 'kHz'
+		),
+		'30m' => array(
+			'SSB' => "10120000",
+			'DATA' => "10145000",
+			'CW' => "10120000",
+			'NOMINAL' => "10",
+			'UNIT' => 'kHz'
+		),
+		'20m' => array(
+			'SSB' => "14200000",
+			'DATA' => "14080000",
+			'CW' => "14020000",
+			'NOMINAL' => "14",
+			'UNIT' => 'kHz'
+		),
+		'17m' => array(
+			'SSB' => "18130000",
+			'DATA' => "18105000",
+			'CW' => "18080000",
+			'NOMINAL' => "18",
+			'UNIT' => 'kHz'
+		),
+		'15m' => array(
+			'SSB' => "21300000",
+			'DATA' => "21080000",
+			'CW' => "21020000",
+			'NOMINAL' => "21",
+			'UNIT' => 'kHz'
+		),
+		'12m' => array(
+			'SSB' => "24950000",
+			'DATA' => "24925000",
+			'CW' => "24900000",
+			'NOMINAL' => "24",
+			'UNIT' => 'kHz'
+		),
+		'10m' => array(
+			'SSB' => "28300000",
+			'DATA' => "28120000",
+			'CW' => "28050000",
+			'NOMINAL' => "28",
+			'UNIT' => 'kHz'
+		),
+		'6m' => array(
+			'SSB' => "50150000",
+			'DATA' => "50230000",
+			'CW' => "50090000",
+			'NOMINAL' => "50",
+			'UNIT' => 'MHz'
+		),
+		'4m' => array(
+			'SSB' => "70200000",
+			'DATA' => "70200000",
+			'CW' => "70200000",
+			'NOMINAL' => "70",
+			'UNIT' => 'MHz'
+		),
+		'2m' => array(
+			'SSB' => "144300000",
+			'DATA' => "144370000",
+			'CW' => "144050000",
+			'NOMINAL' => "144",
+			'UNIT' => 'MHz'
+		),
+		'1.25m' => array(
+			'SSB' => "222100000",
+			'DATA' => "222100000",
+			'CW' => "222100000",
+			'NOMINAL' => "222",
+			'UNIT' => 'MHz'
+		),
+		'70cm' => array(
+			'SSB' => "432200000",
+			'DATA' => "432088000",
+			'CW' => "432050000",
+			'NOMINAL' => "433",
+			'UNIT' => 'MHz'
+		),
+		'33cm' => array(
+			'SSB' => "902100000",
+			'DATA' => "902100000",
+			'CW' => "902100000",
+			'NOMINAL' => "902",
+			'UNIT' => 'MHz'
+		),
+		'23cm' => array(
+			'SSB' => "1296000000",
+			'DATA' => "1296138000",
+			'CW' => "129600000",
+			'NOMINAL' => "1296",
+			'UNIT' => 'GHz'
+		),
+		'13cm' => array(
+			'SSB' => "2320800000",
+			'DATA' => "2320800000",
+			'CW' => "2320800000",
+			'NOMINAL' => "2400",
+			'UNIT' => 'GHz'
+		),
+		'9cm' => array(
+			'SSB' => "3410000000",
+			'DATA' => "3410000000",
+			'CW' => "3400000000",
+			'NOMINAL' => "3400",
+			'UNIT' => 'GHz'
+		),
+		'6cm' => array(
+			'SSB' => "5670000000",
+			'DATA' => "5670000000",
+			'CW' => "5670000000",
+			'NOMINAL' => "5670",
+			'UNIT' => 'GHz'
+		),
+		'3cm' => array(
+			'SSB' => "10225000000",
+			'DATA' => "10225000000",
+			'CW' => "10225000000",
+			'NOMINAL' => "10225",
+			'UNIT' => 'GHz'
+		),
+		'1.25cm' => array(
+			'SSB' => "24000000000",
+			'DATA' => "24000000000",
+			'CW' => "24000000000",
+			'NOMINAL' => "24000",
+			'UNIT' => 'GHz'
+		),
+	);
 
 	/* Class to convert band and mode into a frequency in a format based on the specifications of the database table */
-	public function convert_band($band, $mode='SSB') {
+	public function convert_band($band, $mode = 'SSB') {
 		// Converting LSB and USB to SSB
-		if($mode =='LSB' or $mode =='USB'){
-		  $mode= "SSB";
+		if ($mode == 'LSB' or $mode == 'USB') {
+			$mode = "SSB";
 		}
 
 		// Use 'DATA' for any of the data modes
-		if($mode !='CW' and $mode !='SSB'){
-		  $mode= "DATA";
+		if ($mode != 'CW' and $mode != 'SSB') {
+			$mode = "DATA";
 		}
 
 		return $this->getDefaultFrequency($band, $mode);
 	}
 
 	function getDefaultFrequency($band, $mode) {
-		$CI =& get_instance();
-		$db =& $CI->db;
+		$CI = &get_instance();
+		$db = &$CI->db;
 
 		$db->from('bands');
 		$db->where('bands.band', $band);
@@ -198,10 +254,18 @@ class Frequency {
 		return $Band;
 	}
 
-	 // converts a frequency in Hz to MHz output
-	 function hz_to_mhz($frequency)
-	 {
-		 return number_format (($frequency / 1000 / 1000), 3) . " MHz";
-	 }
+	// converts a frequency in Hz to MHz output
+	function hz_to_mhz($frequency) {
+		return number_format(($frequency / 1000 / 1000), 3) . " MHz";
+	}
+
+	function get_qrg_unit($band) {
+		if (isset($this->defaultFrequencies[$band]['UNIT'])) {
+			$unit = $this->defaultFrequencies[$band]['UNIT'];
+		} else {
+			$unit = 'kHz'; // we use kHz as fallback unit
+		}
+		return $unit;
+	}
 }
 /* End of file Frequency.php */
diff --git a/application/views/bands/index.php b/application/views/bands/index.php
index ae9cce13e..b4f1b2290 100644
--- a/application/views/bands/index.php
+++ b/application/views/bands/index.php
@@ -17,139 +17,147 @@ $wwff = 0;
 ?>
 <div class="container">
 
-<br>
+	<br>
 	<?php if($this->session->flashdata('message')) { ?>
 		<!-- Display Message -->
 		<div class="alert-message error">
-		  <p><?php echo $this->session->flashdata('message'); ?></p>
+			<p><?php echo $this->session->flashdata('message'); ?></p>
 		</div>
 	<?php } ?>
 
-<h2><?= __("Bands"); ?></h2>
+	<h2><?= __("Bands"); ?></h2>
 
-<div class="card">
-<div class="card-header">
-	<?= __("Bands"); ?>
-  </div>
-  <div class="card-body">
-    <p class="card-text">
-		<?= __("Using the band list you can control which bands are shown when creating a new QSO."); ?>
-	</p>
-    <p class="card-text">
-		<?= __("Active bands will be shown in the QSO 'Band' drop-down, while inactive bands will be hidden and cannot be selected."); ?>
-	</p>
-    <div class="table-responsive">
+	<div class="card">
+		<div class="card-header">
+			<?= __("Bands"); ?>
+		</div>
+		<div class="card-body">
+			<p class="card-text">
+				<?= __("Using the band list you can control which bands are shown when creating a new QSO."); ?><br>
+				<?= __("Active bands will be shown in the QSO 'Band' drop-down, while inactive bands will be hidden and cannot be selected."); ?>
+			</p>
+			<div class="table-responsive">
 
-    <table style="width:100%" class="bandtable table table-sm table-striped">
-			<thead>
-				<tr>
-					<th></th>
-					<th><?= __("Band"); ?></th>
-					<th><?= __("CQ"); ?></th>
-                    <th><?= __("DOK"); ?></th>
-                    <th><?= __("DXCC"); ?></th>
-					<th><?= __("H26"); ?></th>
-                    <th><?= __("IOTA"); ?></th>
-                    <th><?= __("JCC"); ?></th>
-					<th><?= __("POTA"); ?></th>
-					<th><?= __("RAC"); ?></th>
-					<th><?= __("Sig"); ?></th>
-                    <th><?= __("SOTA"); ?></th>
-                    <th><?= __("USA County"); ?></th>
-                    <th><?= __("VUCC"); ?></th>
-                    <th><?= __("WAJA"); ?></th>
-                    <th><?= __("WAS"); ?></th>
-					<th><?= __("WWFF"); ?></th>
-					<th><?= __("Bandgroup"); ?></th>
-					<th><?= __("SSB QRG"); ?></th>
-					<th><?= __("DATA QRG"); ?></th>
-					<th><?= __("CW QRG"); ?></th>
-					<?php if($this->session->userdata('user_type') == '99') { ?>
-                    <th></th>
-                    <th></th>
-					<?php } ?>
-				</tr>
-			</thead>
-			<tbody>
-				<?php foreach ($bands as $band) { ?>
-				<tr>
-                    <td style="text-align: center; vertical-align: middle;" class='band_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->active == 1) {echo 'checked';}?>></td>
-					<td style="text-align: center; vertical-align: middle;" ><?php echo $band->band;?></td>
-					<td style="text-align: center; vertical-align: middle;" class='cq_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->cq == 1) {echo 'checked'; $cq++;}?>></td>
-                    <td style="text-align: center; vertical-align: middle;" class='dok_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->dok == 1) {echo 'checked'; $dok++;}?>></td>
-                    <td style="text-align: center; vertical-align: middle;" class='dxcc_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->dxcc == 1) {echo 'checked'; $dxcc++;}?>></td>
-					<td style="text-align: center; vertical-align: middle;" class='helvetia_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->helvetia == 1) {echo 'checked'; $helvetia++;}?>></td>
-                    <td style="text-align: center; vertical-align: middle;" class='iota_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->iota == 1) {echo 'checked'; $iota++;}?>></td>
-                    <td style="text-align: center; vertical-align: middle;" class='jcc_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->jcc == 1) {echo 'checked'; $jcc++;}?>></td>
-                    <td style="text-align: center; vertical-align: middle;" class='pota_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->pota == 1) {echo 'checked'; $pota++;}?>></td>
-					<td style="text-align: center; vertical-align: middle;" class='rac_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->rac == 1) {echo 'checked'; $rac++;}?>></td>
-                    <td style="text-align: center; vertical-align: middle;" class='sig_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->sig == 1) {echo 'checked'; $sig++;}?>></td>
-                    <td style="text-align: center; vertical-align: middle;" class='sota_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->sota == 1) {echo 'checked'; $sota++;}?>></td>
-                    <td style="text-align: center; vertical-align: middle;" class='uscounties_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->uscounties == 1) {echo 'checked'; $uscounties++;}?>></td>
-                    <td style="text-align: center; vertical-align: middle;" class='vucc_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->vucc == 1) {echo 'checked'; $vucc++;}?>></td>
-                    <td style="text-align: center; vertical-align: middle;" class='waja_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->waja == 1) {echo 'checked'; $waja++;}?>></td>
-                    <td style="text-align: center; vertical-align: middle;" class='was_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->was == 1) {echo 'checked'; $was++;}?>></td>
-					<td style="text-align: center; vertical-align: middle;" class='wwff_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->wwff == 1) {echo 'checked'; $wwff++;}?>></td>
-					<td style="text-align: center; vertical-align: middle;" ><?php echo $band->bandgroup;?></td>
-					<td style="text-align: center; vertical-align: middle;" ><?php echo $band->ssb;?></td>
-					<td style="text-align: center; vertical-align: middle;" ><?php echo $band->data;?></td>
-					<td style="text-align: center; vertical-align: middle;" ><?php echo $band->cw;?></td>
-					<?php if($this->session->userdata('user_type') == '99') { ?>
-						<td style="text-align: center; vertical-align: middle;" >
-						<a href="javascript:editBandDialog('<?php echo $band->bandid ?>');" class="btn btn-outline-primary btn-sm" title="Edit"><i class="fas fa-edit"></i></a>
-					</td>
-					<td style="text-align: center; vertical-align: middle;" >
-						<a href="javascript:deleteBand('<?php echo $band->id . '\',\'' . $band->band ?>');" class="btn btn-danger btn-sm" title="Delete"><i class="fas fa-trash-alt"></i></a>
-                    </td>
-					<?php } ?>
-				</tr>
+				<table style="width:100%" class="bandtable table table-sm table-striped">
+					<thead>
+						<tr>
+							<th></th>
+							<th><?= __("Band"); ?></th>
+							<th><?= __("CQ"); ?></th>
+							<th><?= __("DOK"); ?></th>
+							<th><?= __("DXCC"); ?></th>
+							<th><?= __("H26"); ?></th>
+							<th><?= __("IOTA"); ?></th>
+							<th><?= __("JCC"); ?></th>
+							<th><?= __("POTA"); ?></th>
+							<th><?= __("RAC"); ?></th>
+							<th><?= __("Sig"); ?></th>
+							<th><?= __("SOTA"); ?></th>
+							<th><?= __("USA County"); ?></th>
+							<th><?= __("VUCC"); ?></th>
+							<th><?= __("WAJA"); ?></th>
+							<th><?= __("WAS"); ?></th>
+							<th><?= __("WWFF"); ?></th>
+							<th><?= __("Bandgroup"); ?></th>
+							<th><?= __("SSB QRG"); ?></th>
+							<th><?= __("DATA QRG"); ?></th>
+							<th><?= __("CW QRG"); ?></th>
+							<th><?= __("QRG Unit"); ?></th>
+							<?php if($this->session->userdata('user_type') == '99') { ?>
+								<th></th>
+								<th></th>
+							<?php } ?>
+						</tr>
+					</thead>
+					<tbody>
+						<?php foreach ($bands as $band) { ?>
+							<tr>
+								<td style="text-align: center; vertical-align: middle;" class='band_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->active == 1) {echo 'checked';}?>></td>
+								<td style="text-align: center; vertical-align: middle;" ><?php echo $band->band;?></td>
+								<td style="text-align: center; vertical-align: middle;" class='cq_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->cq == 1) {echo 'checked'; $cq++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='dok_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->dok == 1) {echo 'checked'; $dok++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='dxcc_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->dxcc == 1) {echo 'checked'; $dxcc++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='helvetia_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->helvetia == 1) {echo 'checked'; $helvetia++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='iota_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->iota == 1) {echo 'checked'; $iota++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='jcc_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->jcc == 1) {echo 'checked'; $jcc++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='pota_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->pota == 1) {echo 'checked'; $pota++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='rac_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->rac == 1) {echo 'checked'; $rac++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='sig_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->sig == 1) {echo 'checked'; $sig++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='sota_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->sota == 1) {echo 'checked'; $sota++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='uscounties_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->uscounties == 1) {echo 'checked'; $uscounties++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='vucc_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->vucc == 1) {echo 'checked'; $vucc++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='waja_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->waja == 1) {echo 'checked'; $waja++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='was_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->was == 1) {echo 'checked'; $was++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" class='wwff_<?php echo $band->id ?>'><input type="checkbox" <?php if ($band->wwff == 1) {echo 'checked'; $wwff++;}?>></td>
+								<td style="text-align: center; vertical-align: middle;" ><?php echo $band->bandgroup;?></td>
+								<td style="text-align: center; vertical-align: middle;" ><?php echo $band->ssb;?></td>
+								<td style="text-align: center; vertical-align: middle;" ><?php echo $band->data;?></td>
+								<td style="text-align: center; vertical-align: middle;" ><?php echo $band->cw;?></td>
+								<td style="text-align: center; vertical-align: middle;" class='band_<?php echo $band->id ?>'>
+									<select class="form-select" name="unit_<?php echo $band->id; ?>">
+										<?php foreach($units as $unit): ?>
+											<option value="<?php echo $unit; ?>" <?php if ($this->frequency->get_qrg_unit($band->band) == $unit) { echo 'selected';} ?>><?php echo $unit; ?></option>
+										<?php endforeach; ?>
+									</select>
+								</td>
+								<?php if($this->session->userdata('user_type') == '99') { ?>
+									<td style="text-align: center; vertical-align: middle;" >
+										<a href="javascript:editBandDialog('<?php echo $band->bandid ?>');" class="btn btn-outline-primary btn-sm" title="Edit"><i class="fas fa-edit"></i></a>
+									</td>
+									<td style="text-align: center; vertical-align: middle;" >
+										<a href="javascript:deleteBand('<?php echo $band->id . '\',\'' . $band->band ?>');" class="btn btn-danger btn-sm" title="Delete"><i class="fas fa-trash-alt"></i></a>
+									</td>
+								<?php } ?>
+							</tr>
 
+						<?php } ?>
+					</tbody>
+					<tfoot>
+						<th><?= __("All"); ?></th>
+						<th></th>
+						<th class="master_cq"><input type="checkbox" <?php if ($cq > 0) echo 'checked';?>></th>
+						<th class="master_dok"><input type="checkbox" <?php if ($dok > 0) echo 'checked';?>></th>
+						<th class="master_dxcc"><input type="checkbox" <?php if ($dxcc > 0) echo 'checked';?>></th>
+						<th class="master_helvetia"><input type="checkbox" <?php if ($helvetia > 0) echo 'checked';?>></th>
+						<th class="master_iota"><input type="checkbox" <?php if ($iota > 0) echo 'checked';?>></th>
+						<th class="master_jcc"><input type="checkbox" <?php if ($jcc > 0) echo 'checked';?>></th>
+						<th class="master_pota"><input type="checkbox" <?php if ($pota > 0) echo 'checked';?>></th>
+						<th class="master_rac"><input type="checkbox" <?php if ($rac > 0) echo 'checked';?>></th>
+						<th class="master_sig"><input type="checkbox" <?php if ($sig > 0) echo 'checked';?>></th>
+						<th class="master_sota"><input type="checkbox" <?php if ($sota > 0) echo 'checked';?>></th>
+						<th class="master_uscounties"><input type="checkbox" <?php if ($uscounties > 0) echo 'checked';?>></th>
+						<th class="master_vucc"><input type="checkbox" <?php if ($vucc > 0) echo 'checked';?>></th>
+						<th class="master_waja"><input type="checkbox" <?php if ($waja > 0) echo 'checked';?>></th>
+						<th class="master_was"><input type="checkbox" <?php if ($was > 0) echo 'checked';?>></th>
+						<th class="master_wwff"><input type="checkbox" <?php if ($wwff > 0) echo 'checked';?>></th>
+						<th></th>
+						<th></th>
+						<th></th>
+						<th></th>
+						<th></th>
+						<?php if($this->session->userdata('user_type') == '99') { ?>
+							<th></th>
+							<th></th>
+						<?php } ?>
+					</tfoot>
+					<table>
+			</div>
+  			<br/>
+			<p>
+				<?php if($this->session->userdata('user_type') == '99') { ?>
+					<script>
+						var lang_options_bands_edit = '<?= __("Edit Band"); ?>';
+						var lang_options_bands_create = '<?= __("Create a band"); ?>';
+						var lang_admin_close = '<?= __("Close"); ?>';
+						var lang_options_bands_delete_warning = '<?= __("Warning! Are you sure you want to delete the following band: "); ?>';
+						var lang_options_bands_activateall_warning = '<?= __("Warning! Are you sure you want to activate all bands?"); ?>';
+						var lang_options_bands_deactivateall_warning = '<?= __("Warning! Are you sure you want to deactivate all bands?"); ?>';
+					</script>
+					<button onclick="createBandDialog();" class="btn btn-primary btn-sm"><i class="fas fa-plus"></i> <?= __("Create a band"); ?></button>
+					<button onclick="activateAllBands();" class="btn btn-primary btn-sm"><?= __("Activate All"); ?></button>
+					<button onclick="deactivateAllBands();" class="btn btn-primary btn-sm"><?= __("Deactivate All"); ?></button>
 				<?php } ?>
-			</tbody>
-			<tfoot>
-					<th><?= __("All"); ?></th>
-					<th></th>
-					<th class="master_cq"><input type="checkbox" <?php if ($cq > 0) echo 'checked';?>></th>
-					<th class="master_dok"><input type="checkbox" <?php if ($dok > 0) echo 'checked';?>></th>
-					<th class="master_dxcc"><input type="checkbox" <?php if ($dxcc > 0) echo 'checked';?>></th>
-					<th class="master_helvetia"><input type="checkbox" <?php if ($helvetia > 0) echo 'checked';?>></th>
-					<th class="master_iota"><input type="checkbox" <?php if ($iota > 0) echo 'checked';?>></th>
-					<th class="master_jcc"><input type="checkbox" <?php if ($jcc > 0) echo 'checked';?>></th>
-					<th class="master_pota"><input type="checkbox" <?php if ($pota > 0) echo 'checked';?>></th>
-					<th class="master_rac"><input type="checkbox" <?php if ($rac > 0) echo 'checked';?>></th>
-					<th class="master_sig"><input type="checkbox" <?php if ($sig > 0) echo 'checked';?>></th>
-					<th class="master_sota"><input type="checkbox" <?php if ($sota > 0) echo 'checked';?>></th>
-					<th class="master_uscounties"><input type="checkbox" <?php if ($uscounties > 0) echo 'checked';?>></th>
-					<th class="master_vucc"><input type="checkbox" <?php if ($vucc > 0) echo 'checked';?>></th>
-					<th class="master_waja"><input type="checkbox" <?php if ($waja > 0) echo 'checked';?>></th>
-					<th class="master_was"><input type="checkbox" <?php if ($was > 0) echo 'checked';?>></th>
-					<th class="master_wwff"><input type="checkbox" <?php if ($wwff > 0) echo 'checked';?>></th>
-					<th></th>
-					<th></th>
-					<th></th>
-                    <th></th>
-					<?php if($this->session->userdata('user_type') == '99') { ?>
-                    <th></th>
-                    <th></th>
-					<?php } ?>
-			</tfoot>
-		<table>
+			</p>
+		</div>
 	</div>
-  <br/>
-  <p>
-		<?php if($this->session->userdata('user_type') == '99') { ?>
-		<script>
-			var lang_options_bands_edit = '<?= __("Edit Band"); ?>';
-			var lang_options_bands_create = '<?= __("Create a band"); ?>';
-			var lang_admin_close = '<?= __("Close"); ?>';
-			var lang_options_bands_delete_warning = '<?= __("Warning! Are you sure you want to delete the following band: "); ?>';
-			var lang_options_bands_activateall_warning = '<?= __("Warning! Are you sure you want to activate all bands?"); ?>';
-			var lang_options_bands_deactivateall_warning = '<?= __("Warning! Are you sure you want to deactivate all bands?"); ?>';
-		</script>
-	  	<button onclick="createBandDialog();" class="btn btn-primary btn-sm"><i class="fas fa-plus"></i> <?= __("Create a band"); ?></button>
-  		<button onclick="activateAllBands();" class="btn btn-primary btn-sm"><?= __("Activate All"); ?></button>
-		<button onclick="deactivateAllBands();" class="btn btn-primary btn-sm"><?= __("Deactivate All"); ?></button>
-		<?php } ?>
-	</p>
-</div>
-</div>
+</div>
\ No newline at end of file