diff --git a/html/pages/bill/delete.inc.php b/html/pages/bill/delete.inc.php
index f39af8cfc..6a7d247b5 100644
--- a/html/pages/bill/delete.inc.php
+++ b/html/pages/bill/delete.inc.php
@@ -29,6 +29,6 @@
     You are about to delete this bill.
   </div>
   <div class="form-actions">
-    <button id="deleteBtn" type="submit" class="btn btn-danger" disabled="disabled"><i class="icon-trash icon-white"></i> <strong>Delete Bill</strong></button>
+    <button id="deleteBtn" type="submit" class="btn btn-danger" disabled="disabled"><i class="fa fa-trash"></i> <strong>Delete Bill</strong></button>
   </div>
 </form>
diff --git a/html/pages/bill/edit.inc.php b/html/pages/bill/edit.inc.php
index 8120de259..3fd69c361 100644
--- a/html/pages/bill/edit.inc.php
+++ b/html/pages/bill/edit.inc.php
@@ -1,123 +1,123 @@
 <?php
-
-require 'includes/javascript-interfacepicker.inc.php';
-
-// This needs more verification. Is it already added? Does it exist?
-// Calculation to extract MB/GB/TB of Kbps/Mbps/Gbps
-$base = $config['billing']['base'];
-
-if ($bill_data['bill_type'] == 'quota') {
-    $data      = $bill_data['bill_quota'];
-    $tmp['mb'] = ($data / $base / $base);
-    $tmp['gb'] = ($data / $base / $base / $base);
-    $tmp['tb'] = ($data / $base / $base / $base / $base);
-    if ($tmp['tb'] >= 1) {
-        $quota = array(
-            'type'      => 'tb',
-            'select_tb' => ' selected',
-            'data'      => $tmp['tb'],
-        );
-    }
-    else if (($tmp['gb'] >= 1) and ($tmp['gb'] < $base)) {
-        $quota = array(
-            'type'      => 'gb',
-            'select_gb' => ' selected',
-            'data'      => $tmp['gb'],
-        );
-    }
-    else if (($tmp['mb'] >= 1) and ($tmp['mb'] < $base)) {
-        $quota = array(
-            'type'      => 'mb',
-            'select_mb' => ' selected',
-            'data'      => $tmp['mb'],
-        );
-    }
-}//end if
-
-if ($bill_data['bill_type'] == 'cdr') {
-    $data        = $bill_data['bill_cdr'];
-    $tmp['kbps'] = ($data / $base);
-    $tmp['mbps'] = ($data / $base / $base);
-    $tmp['gbps'] = ($data / $base / $base / $base);
-    if ($tmp['gbps'] >= 1) {
-        $cdr = array(
-            'type'        => 'gbps',
-            'select_gbps' => ' selected',
-            'data'        => $tmp['gbps'],
-        );
-    }
-    else if (($tmp['mbps'] >= 1) and ($tmp['mbps'] < $base)) {
-        $cdr = array(
-            'type'        => 'mbps',
-            'select_mbps' => ' selected',
-            'data'        => $tmp['mbps'],
-        );
-    }
-    else if (($tmp['kbps'] >= 1) and ($tmp['kbps'] < $base)) {
-        $cdr = array(
-            'type'        => 'kbps',
-            'select_kbps' => ' selected',
-            'data'        => $tmp['kbps'],
-        );
-    }
-}//end if
-
-?>
-
+  require 'includes/javascript-interfacepicker.inc.php';
+  
+  // This needs more verification. Is it already added? Does it exist?
+  // Calculation to extract MB/GB/TB of Kbps/Mbps/Gbps
+  $base = $config['billing']['base'];
+  
+  if ($bill_data['bill_type'] == 'quota') {
+      $data      = $bill_data['bill_quota'];
+      $tmp['mb'] = ($data / $base / $base);
+      $tmp['gb'] = ($data / $base / $base / $base);
+      $tmp['tb'] = ($data / $base / $base / $base / $base);
+      if ($tmp['tb'] >= 1) {
+          $quota = array(
+              'type'      => 'tb',
+              'select_tb' => ' selected',
+              'data'      => $tmp['tb'],
+          );
+      }
+      else if (($tmp['gb'] >= 1) and ($tmp['gb'] < $base)) {
+          $quota = array(
+              'type'      => 'gb',
+              'select_gb' => ' selected',
+              'data'      => $tmp['gb'],
+          );
+      }
+      else if (($tmp['mb'] >= 1) and ($tmp['mb'] < $base)) {
+          $quota = array(
+              'type'      => 'mb',
+              'select_mb' => ' selected',
+              'data'      => $tmp['mb'],
+          );
+      }
+  }//end if
+  
+  if ($bill_data['bill_type'] == 'cdr') {
+      $data        = $bill_data['bill_cdr'];
+      $tmp['kbps'] = ($data / $base);
+      $tmp['mbps'] = ($data / $base / $base);
+      $tmp['gbps'] = ($data / $base / $base / $base);
+      if ($tmp['gbps'] >= 1) {
+          $cdr = array(
+              'type'        => 'gbps',
+              'select_gbps' => ' selected',
+              'data'        => $tmp['gbps'],
+          );
+      }
+      else if (($tmp['mbps'] >= 1) and ($tmp['mbps'] < $base)) {
+          $cdr = array(
+              'type'        => 'mbps',
+              'select_mbps' => ' selected',
+              'data'        => $tmp['mbps'],
+          );
+      }
+      else if (($tmp['kbps'] >= 1) and ($tmp['kbps'] < $base)) {
+          $cdr = array(
+              'type'        => 'kbps',
+              'select_kbps' => ' selected',
+              'data'        => $tmp['kbps'],
+          );
+      }
+  }//end if
+  
+  ?>
 <form id="edit" name="edit" method="post" action="" class="form-horizontal" role="form">
   <input type=hidden name="action" value="update_bill">
-<script type="text/javascript">
-function billType() {
-    $('#cdrDiv').toggle();
-    $('#quotaDiv').toggle();
-}
-</script>
+  <script type="text/javascript">
+    function billType() {
+        $('#cdrDiv').toggle();
+        $('#quotaDiv').toggle();
+    }
+  </script>
   <h3>Bill Properties</h3>
+  <hr>
   <div class="form-group">
-    <label class="col-sm-2 control-label" for="bill_name"><strong>Description</strong></label>
     <div class="col-sm-4">
+      <label class="control-label" for="bill_name">
+        <h5><strong>Description</strong></h5>
+      </label>
       <input class="form-control input-sm" name="bill_name" value="<?php echo $bill_data['bill_name']; ?>" />
     </div>
-    <div class="col-sm-6">
-    </div>
   </div>
   <div class="form-group">
-    <label class="col-sm-2 control-label" for="bill_type"><strong>Billing Type</strong></label>
-    <div class="col-sm-10">
+    <div class="col-sm-4">
+      <label class="control-label" for="bill_type">
+        <h5><strong>Billing Type</strong></h5>
+      </label>
+      <br>
       <div class="radio">
         <label>
-          <input type="radio" name="bill_type" value="cdr" onchange="javascript: billType();"
-<?php
-if ($bill_data['bill_type'] == 'cdr') {
-    echo 'checked ';
-};
-?>
-/> CDR 95th
+        <input type="radio" name="bill_type" value="cdr" onchange="javascript: billType();"
+          <?php
+            if ($bill_data['bill_type'] == 'cdr') {
+                echo 'checked ';
+            };
+            ?>
+          /> CDR 95th
         </label>
       </div>
       <div class="radio">
         <label>
-          <input type="radio" name="bill_type" value="quota" onchange="javascript: billType();"
-<?php
-if ($bill_data['bill_type'] == 'quota') {
-    echo 'checked ';
-};
-?>
-/> Quota
+        <input type="radio" name="bill_type" value="quota" onchange="javascript: billType();"
+          <?php
+            if ($bill_data['bill_type'] == 'quota') {
+                echo 'checked ';
+            };
+            ?>
+          /> Quota
         </label>
       </div>
     </div>
   </div>
   <div id="cdrDiv"
-<?php
-if ($bill_data['bill_type'] == 'quota') {
-    echo ' style="display: none"';
-};
-?>
->
+    <?php
+      if ($bill_data['bill_type'] == 'quota') {
+          echo ' style="display: none"';
+      };
+      ?>
+    >
     <div class="form-group">
-      <div class="col-sm-2">
-      </div>
       <div class="col-sm-2">
         <input class="form-control input-sm" type="text" name="bill_cdr" value="<?php echo $cdr['data']; ?>">
       </div>
@@ -133,15 +133,13 @@ if ($bill_data['bill_type'] == 'quota') {
     </div>
   </div>
   <div id="quotaDiv"
-<?php
-if ($bill_data['bill_type'] == 'cdr') {
-    echo ' style="display: none"';
-};
-?>
->
+    <?php
+      if ($bill_data['bill_type'] == 'cdr') {
+          echo ' style="display: none"';
+      };
+      ?>
+    >
     <div class="form-group">
-      <div class="col-sm-2">
-      </div>
       <div class="col-sm-2">
         <input class="form-control input-sm" type="text" name="bill_quota" value="<?php echo $quota['data']; ?>">
       </div>
@@ -157,132 +155,145 @@ if ($bill_data['bill_type'] == 'cdr') {
     </div>
   </div>
   <div class="form-group">
-    <label class="col-sm-2 control-label" for="bill_day"><strong>Billing Day</strong></label>
     <div class="col-sm-2">
+      <label class="control-label" for="bill_day">
+        <h5><strong>Billing Day</strong></h5>
+      </label>
       <select name="bill_day" class="form-control input">
-<?php
-for ($x = 1; $x < 32; $x++) {
-    $select = (($bill_data['bill_day'] == $x) ? ' selected' : '');
-    echo '          <option value="'.$x.'"'.$select.'>'.$x."</option>\n";
-}
-
-?>
+      <?php
+        for ($x = 1; $x < 32; $x++) {
+            $select = (($bill_data['bill_day'] == $x) ? ' selected' : '');
+            echo '          <option value="'.$x.'"'.$select.'>'.$x."</option>\n";
+        }
+        
+        ?>
       </select>
     </div>
   </div>
+  <br>
   <h3>Optional Information</h3>
+  <hr>
   <div class="form-group">
-    <label class="col-sm-2 control-label" for="bill_custid"><strong>Customer&nbsp;Reference</strong></label>
     <div class="col-sm-4">
+      <label class="control-label" for="bill_custid">
+        <h5><strong>Customer&nbsp;Reference</strong></h5>
+      </label>
       <input class="form-control input-sm" type="text" name="bill_custid" value="<?php echo $bill_data['bill_custid']; ?>" />
     </div>
     <div class="col-sm-6">
     </div>
   </div>
   <div class="form-group">
-    <label class="col-sm-2 control-label" for="bill_ref"><strong>Billing Reference</strong></label>
     <div class="col-sm-4">
+      <label class="control-label" for="bill_ref">
+        <h5><strong>Billing Reference</strong></h5>
+      </label>
       <input class="form-control input-sm" type="text" name="bill_ref" value="<?php echo $bill_data['bill_ref']; ?>" />
     </div>
     <div class="col-sm-6">
     </div>
   </div>
   <div class="form-group">
-    <label class="col-sm-2 control-label" for="bill_notes"><strong>Notes</strong></label>
     <div class="col-sm-4">
+      <label class="control-label" for="bill_notes">
+        <h5><strong>Notes</strong></h5>
+      </label>
       <textarea rows="3" class="form-control input-sm" name="bill_notes" value="<?php echo $bill_data['bill_notes']; ?>"></textarea>
     </div>
   </div>
-  <button type="submit" class="btn btn-success" name="Submit" value="Save" /><i class="icon-ok icon-white"></i> <strong>Save Properties</strong></button>
+  <button type="submit" class="btn btn-success" name="Submit" value="Save" /><i class="fa fa-check"></i> <strong>Save Properties</strong></button>
 </form>
-
-  <h3>Billed Ports</h3>
-  <div class="form-group">
-<?php
-$ports = dbFetchRows(
-    'SELECT * FROM `bill_ports` AS B, `ports` AS P, `devices` AS D
-    WHERE B.bill_id = ? AND P.port_id = B.port_id
-    AND D.device_id = P.device_id ORDER BY D.device_id',
-    array($bill_data['bill_id'])
-);
-
-if (is_array($ports)) {
-    foreach ($ports as $port) {
-        $emptyCheck = true;
-        $devicebtn  = str_replace('list-device', 'btn', generate_device_link($port));
-        $devicebtn  = str_replace("overlib('", "overlib('<div style=\'border: 5px solid #e5e5e5; background: #fff; padding: 10px;\'>", $devicebtn);
-        $devicebtn  = str_replace("<div>',;", "</div></div>',", $devicebtn);
-        $portbtn    = str_replace('interface-upup', 'btn', generate_port_link($port));
-        $portbtn    = str_replace('interface-updown', 'btn btn-warning', $portbtn);
-        $portbtn    = str_replace('interface-downdown', 'btn btn-warning', $portbtn);
-        $portbtn    = str_replace('interface-admindown', 'btn btn-warning disabled', $portbtn);
-        $portbtn    = str_replace("overlib('", "overlib('<div style=\'border: 5px solid #e5e5e5; background: #fff; padding: 10px;\'>", $portbtn);
-        $portbtn    = str_replace("<div>',;", "</div></div>',", $portbtn);
-        $portalias  = (empty($port['ifAlias']) ? '' : ' - '.$port['ifAlias'].'');
-        $devicebtn  = str_replace('">'.$port['hostname'], '" style="color: #000;"><i class="glyphicon glyphicon-asterisk"></i> '.$port['hostname'], $devicebtn);
-        $portbtn    = str_replace('">'.strtolower($port['ifName']), '" style="color: #000;"><i class="glyphicon glyphicon-random"></i> '.$port['ifName'].''.$portalias, $portbtn);
-        echo '      <form action="" class="form-inline" method="post" name="delete'.$port['port_id']."\" style=\"display: none;\">\n";
-        echo "        <input type=\"hidden\" name=\"action\" value=\"delete_bill_port\" />\n";
-        echo '        <input type="hidden" name="port_id" value="'.$port['port_id']."\" />\n";
-        echo "      </form>\n";
-        echo "      <div class=\"btn-toolbar\">\n";
-        echo "        <div class=\"btn-group\" style=\"width: 600px;\">\n";
-        // echo("          <a class=\"btn btn-danger\" href=\"javascript:;\" onclick=\"document.delete".$port['port_id'].".submit();\" style=\"color: #fff;\"><i class=\"icon-trash icon-white\"></i></a>\n");
-        echo '          '.$devicebtn."\n";
-        echo '          '.$portbtn."\n";
-        echo "        </div>\n";
-        echo "        <div class=\"btn-group\">\n";
-        echo '          <a class="btn btn-danger btn-mini" href="javascript:;" onclick="document.forms[\'delete'.$port['port_id']."'].submit();\" style=\"color: #fff;\"><i class=\"icon-minus-sign icon-white\"></i> <strong>Remove Interface</strong></a>\n";
-        echo "        </div>\n";
-        echo "      </div>\n";
-    }//end foreach
-
-    if (!$emptyCheck) {
-        echo "      <div class=\"alert alert-info\">\n";
-        echo "        <i class=\"icon-info-sign\"></i> <strong>There are no ports assigned to this bill</strong>\n";
-        echo "      </div>\n";
+<br>
+<h3>Billed Ports</h3>
+<hr>
+<div class="form-group">
+  <?php
+    //This needs a proper cleanup
+    $ports = dbFetchRows(
+        'SELECT * FROM `bill_ports` AS B, `ports` AS P, `devices` AS D
+        WHERE B.bill_id = ? AND P.port_id = B.port_id
+        AND D.device_id = P.device_id ORDER BY D.device_id',
+        array($bill_data['bill_id'])
+    );
+    
+    if (is_array($ports)) {
+        foreach ($ports as $port) {
+            $emptyCheck = true;
+            $devicebtn  = str_replace('list-device', 'btn', generate_device_link($port));
+            $devicebtn  = str_replace("overlib('", "overlib('<div style=\'border: 5px solid #e5e5e5; background: #fff; padding: 10px;\'>", $devicebtn);
+            $devicebtn  = str_replace("<div>',;", "</div></div>',", $devicebtn);
+            $portbtn    = str_replace('interface-upup', 'btn', generate_port_link($port));
+            $portbtn    = str_replace('interface-updown', 'btn btn-warning', $portbtn);
+            $portbtn    = str_replace('interface-downdown', 'btn btn-warning', $portbtn);
+            $portbtn    = str_replace('interface-admindown', 'btn btn-warning disabled', $portbtn);
+            $portbtn    = str_replace("overlib('", "overlib('<div style=\'border: 5px solid #e5e5e5; background: #fff; padding: 10px;\'>", $portbtn);
+            $portbtn    = str_replace("<div>',;", "</div></div>',", $portbtn);
+            $portalias  = (empty($port['ifAlias']) ? '' : ' - '.$port['ifAlias'].'');
+            $devicebtn  = str_replace('">'.$port['hostname'], '" style="color: #000;"><i class="fa fa-asterisk"></i> '.$port['hostname'], $devicebtn);
+            $portbtn    = str_replace('">'.strtolower($port['ifName']), '" style="color: #000;"><i class="fa fa-random"></i> '.$port['ifName'].''.$portalias, $portbtn);
+            echo '      <form action="" class="form-inline" method="post" name="delete'.$port['port_id']."\" style=\"display: none;\">\n";
+            echo "        <input type=\"hidden\" name=\"action\" value=\"delete_bill_port\" />\n";
+            echo '        <input type="hidden" name="port_id" value="'.$port['port_id']."\" />\n";
+            echo "      </form>\n";
+            echo "      <div class=\"btn-toolbar\">\n";
+            echo "        <div class=\"btn-group\" style=\"width: 600px;\">\n";
+            echo '          '.$devicebtn."\n";
+            echo '          '.$portbtn."\n";
+            echo "        </div>\n";
+            echo "        <div class=\"btn-group\">\n";
+            echo '          <a class="btn btn-danger btn-mini" href="javascript:;" onclick="document.forms[\'delete'.$port['port_id']."'].submit();\" style=\"color: #fff;\"><i class=\"fa fa-minus\"></i> <strong>Remove Interface</strong></a>\n";
+            echo "        </div>\n";
+            echo "      </div>\n";
+        }
+    
+        if (!$emptyCheck) {
+            echo "      <div class=\"alert alert-info\">\n";
+            echo "        <i class=\"fa fa-info\"></i> <strong>There are no ports assigned to this bill</strong>\n";
+            echo "      </div>\n";
+        }
     }
-}//end if
-?>
-    </div>
-  </fieldset>
+    ?>
+</div>
+</fieldset>
 <form action="" method="post" class="form-horizontal" role="form">
   <input type="hidden" name="action" value="add_bill_port" />
   <input type="hidden" name="bill_id" value="<?php echo $bill_id; ?>" />
+  <br>
   <h3>Add Port</h3>
+  <hr>
   <div class="form-group">
-    <label class="col-sm-2 control-label" for="device"><strong>Device</strong></label>
     <div class="col-sm-4">
+      <label class="control-label" for="device">
+        <h5><strong>Device</strong></h5>
+      </label>
       <select class="form-control input-sm" id="device" name="device" onchange="getInterfaceList(this)">
         <option value=''>Select a device</option>
-<?php
-$devices = dbFetchRows('SELECT * FROM `devices` ORDER BY hostname');
-foreach ($devices as $device) {
-    unset($done);
-    foreach ($access_list as $ac) {
-        if ($ac == $device['device_id']) {
-            $done = 1;
-        }
-    }
-
-    if (!$done) {
-        echo "          <option value='".$device['device_id']."'>".$device['hostname']."</option>\n";
-    }
-}
-
-?>
+        <?php
+          $devices = dbFetchRows('SELECT * FROM `devices` ORDER BY hostname');
+          foreach ($devices as $device) {
+              unset($done);
+              foreach ($access_list as $ac) {
+                  if ($ac == $device['device_id']) {
+                      $done = 1;
+                  }
+              }
+          
+              if (!$done) {
+                  echo "          <option value='".$device['device_id']."'>".$device['hostname']."</option>\n";
+              }
+          }
+          
+          ?>
       </select>
     </div>
-    <div class="col-sm-6">
-    </div>
   </div>
   <div class="form-group">
-    <label class="col-sm-2 control-label" for="port_id"><strong>Interface</strong></label>
     <div class="col-sm-4">
+      <label class="control-label" for="port_id">
+        <h5><strong>Port</strong></h5>
+      </label>
       <select class="form-control input-sm" id="port_id" name="port_id"></select>
     </div>
-    <div class="col-sm-6">
-    <div>
   </div>
-  <button type="submit" class="btn btn-primary" name="Submit" value=" Add " /><i class="icon-plus-sign icon-white"></i> <strong>Add Interface</strong></button>
+  <button type="submit" class="btn btn-primary" name="Submit" value=" Add " /><i class="fa fa-plus"></i> <strong>Add Port</strong></button>
 </form>
diff --git a/html/pages/bill/reset.inc.php b/html/pages/bill/reset.inc.php
index 5721cb9a5..728963abd 100644
--- a/html/pages/bill/reset.inc.php
+++ b/html/pages/bill/reset.inc.php
@@ -37,6 +37,6 @@
     Are you sure you want to reset all <strong>MySQL</strong> and/or <strong>RRD</strong> data for all interface on this bill?
   </div>
   <div class="form-actions">
-    <button id="resetBtn" type="submit" class="btn btn-danger" disabled="disabled"><i class="icon-refresh icon-white"></i> <strong>Reset Bill</strong></button>
+    <button id="resetBtn" type="submit" class="btn btn-danger" disabled="disabled"><i class="fa fa-refresh"></i> <strong>Reset Bill</strong></button>
   </div>
 </form>
\ No newline at end of file
diff --git a/html/pages/bills.inc.php b/html/pages/bills.inc.php
index b367a189d..f9fef2120 100644
--- a/html/pages/bills.inc.php
+++ b/html/pages/bills.inc.php
@@ -76,7 +76,7 @@ if ($_POST['addbill'] == 'yes') {
         $message       .= $message_break.'Port '.mres($_POST['port']).' added!';
         $message_break .= '<br />';
     }
-}//end if
+}
 
 $pagetitle[] = 'Billing';
 
@@ -130,10 +130,10 @@ else if ($vars['view'] == 'add') {
         $devicebtn = str_replace('list-device', 'btn', generate_device_link($port));
         $portbtn   = str_replace('interface-upup', 'btn', generate_port_link($port));
         $portalias = (empty($port['ifAlias']) ? '' : ' - '.$port['ifAlias'].'');
-        $devicebtn = str_replace('">'.$port['hostname'], '" style="color: #000;"><i class="icon-asterisk"></i> '.$port['hostname'], $devicebtn);
+        $devicebtn = str_replace('">'.$port['hostname'], '" style="color: #000;"><i class="fa fa-asterisk"></i> '.$port['hostname'], $devicebtn);
         $devicebtn = str_replace("overlib('", "overlib('<div style=\'border: 5px solid #e5e5e5; background: #fff; padding: 10px;\'>", $devicebtn);
         $devicebtn = str_replace("<div>',;", "</div></div>',", $devicebtn);
-        $portbtn   = str_replace('">'.strtolower($port['ifName']), '" style="color: #000;"><i class="icon-random"></i> '.$port['ifName'].''.$portalias, $portbtn);
+        $portbtn   = str_replace('">'.strtolower($port['ifName']), '" style="color: #000;"><i class="fa fa-random"></i> '.$port['ifName'].''.$portalias, $portbtn);
         $portbtn   = str_replace("overlib('", "overlib('<div style=\'border: 5px solid #e5e5e5; background: #fff; padding: 10px;\'>", $portbtn);
         $portbtn   = str_replace("<div>',;", "</div></div>',", $portbtn);
         echo "  <fieldset>\n";
@@ -148,7 +148,7 @@ else if ($vars['view'] == 'add') {
         echo "      </div>\n";
         echo "    </div>\n";
         echo "  </fieldset>\n";
-    }//end if
+    }
 ?>
 
 <div class="form-group">
@@ -240,7 +240,7 @@ else if ($vars['view'] == 'add') {
   <div class="col-sm-6">
   </div>
 </div>
-<button type="submit" class="btn btn-default"><i class="icon-ok-sign icon-white"></i> <strong>Add Bill</strong></button>
+<button type="submit" class="btn btn-success"><i class="fa fa-check"></i> <strong>Add Bill</strong></button>
 </form>
 
 <?php
@@ -266,7 +266,6 @@ else {
             $day_data = getDates($bill['bill_day']);
             $datefrom = $day_data['0'];
             $dateto   = $day_data['1'];
-            // $rate_data    = getRates($bill['bill_id'],$datefrom,$dateto);
             $rate_data    = $bill;
             $rate_95th    = $rate_data['rate_95th'];
             $dir_95th     = $rate_data['dir_95th'];
@@ -316,10 +315,8 @@ else {
                 ";
 
             $i++;
-        } //end if
-    }//end foreach
-
+        }
+    }
+    
     echo '</table>';
-}//end if
-
-// echo("</td></tr></table>");
+}