diff --git a/src/www/widgets/widgets/traffic_graphs.widget.php b/src/www/widgets/widgets/traffic_graphs.widget.php
index afc851205..ef21b4653 100644
--- a/src/www/widgets/widgets/traffic_graphs.widget.php
+++ b/src/www/widgets/widgets/traffic_graphs.widget.php
@@ -1,44 +1,40 @@
 <?php
 
 /*
-	Copyright (C) 2014 Deciso B.V.
-	Copyright 2007 Scott Dale
-	Copyright (C) 2004-2005 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net>
-	and Jonathan Watt <jwatt@jwatt.org>.
-	All rights reserved.
+    Copyright (C) 2014-2016 Deciso B.V.
+    Copyright 2007 Scott Dale
+    Copyright (C) 2004-2005 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net>
+    and Jonathan Watt <jwatt@jwatt.org>.
+    All rights reserved.
 
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
 
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
 
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
 
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
 */
 
-$nocsrf = true;
-
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
 require_once("interfaces.inc");
 
-$first_time = false;
 
 if (!is_array($config["widgets"]["trafficgraphs"])) {
-    $first_time = true;
     $config["widgets"]["trafficgraphs"] = array();
 }
 $a_config = &$config["widgets"]["trafficgraphs"];
@@ -78,7 +74,7 @@ $shown = array();
 foreach ($a_config["shown"]["item"] as $if) {
     $shown[$if] = true;
 }
-if ($first_time) {
+if (count($config["widgets"]["trafficgraphs"])) {
     $keys = array_keys($ifdescrs);
     $shown[$keys[0]] = true;
 }
@@ -90,85 +86,82 @@ if (isset($a_config["refreshinterval"])) {
 }
 
 if (isset($a_config["scale_type"])) {
-        $scale_type = $a_config["scale_type"];
+    $scale_type = $a_config["scale_type"];
 } else {
-        $scale_type = "up";
+    $scale_type = "up";
 }
 
 ?>
-<input type="hidden" id="traffic_graphs-config" name="traffic_graphs-config" value="" />
-
 <div id="traffic_graphs-settings" class="widgetconfigdiv" style="display:none;">
 <form action="/widgets/widgets/traffic_graphs.widget.php" method="post" name="iform" id="iform">
-				<?php foreach ($ifdescrs as $ifname => $ifdescr) {
-?>
-						<input type="hidden" name="shown[<?= $ifname ?>]" value="<?= $shown[$ifname] ? "show" : "hide" ?>" />
-						<?php
-} ?>
-
+<?php
+  foreach ($ifdescrs as $ifname => $ifdescr):?>
+    <input type="hidden" name="shown[<?= $ifname ?>]" value="<?= $shown[$ifname] ? "show" : "hide" ?>" />
+<?php
+  endforeach; ?>
     <table class="table table-striped">
-	<tbody>
-
-						<tr>
-							<td>
-                <?= gettext('Default AutoScale:') ?>
-							</td>
-						</tr>
-							<?php
-                                $scale_type_up='checked="checked"';
-                                $scale_type_follow="";
-                            if (isset($config["widgets"]["trafficgraphs"]["scale_type"])) {
-                                $selected_radio = $config["widgets"]["trafficgraphs"]["scale_type"];
-                                if ($selected_radio == "up") {
-                                    $scale_type_up = 'checked="checked"';
-                                    $scale_type_follow="";
-                                } elseif ($selected_radio == "follow") {
-                                    $scale_type_up="";
-                                    $scale_type_follow = 'checked="checked"';
-                                }
-                            }
-                            ?>
-			<tr>
-				<td>
-					<input name="scale_type"  type="radio" id="scale_type_up" value="up" <?= $scale_type_up; ?> /> <?= gettext('Scale up')?>
-				</td>
-			</tr>
-			<tr>
-				<td>
-				<input name="scale_type" type="radio" id="scale_type_follow" value="follow" <?= $scale_type_follow; ?> /> <?= gettext('Scale follow')?><br /><br />
-				<?= gettext('Refresh Interval:') ?>
-				<select name="refreshinterval" class="formfld" id="refreshinterval" >
-					<?php for ($i = 1; $i <= 10; $i += 1) {
+      <tbody>
+        <tr>
+          <td>
+            <?= gettext('Default AutoScale:') ?>
+          </td>
+        </tr>
+<?php
+        $scale_type_up='checked="checked"';
+        $scale_type_follow="";
+        if (isset($config["widgets"]["trafficgraphs"]["scale_type"])) {
+            $selected_radio = $config["widgets"]["trafficgraphs"]["scale_type"];
+            if ($selected_radio == "up") {
+                $scale_type_up = 'checked="checked"';
+                $scale_type_follow="";
+            } elseif ($selected_radio == "follow") {
+                $scale_type_up="";
+                $scale_type_follow = 'checked="checked"';
+            }
+        }
+        ?>
+        <tr>
+          <td>
+            <input name="scale_type"  type="radio" id="scale_type_up" value="up" <?= $scale_type_up; ?> /> <?= gettext('Scale up')?>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <input name="scale_type" type="radio" id="scale_type_follow" value="follow" <?= $scale_type_follow; ?> /> <?= gettext('Scale follow')?><br /><br />
+            <?= gettext('Refresh Interval:') ?>
+            <select name="refreshinterval" class="formfld" id="refreshinterval" >
+<?php
+            for ($i = 1; $i <= 10; $i += 1) {
 ?>
-						<option value="<?= $i ?>" <?php if ($refreshinterval == $i) {
-                            echo 'selected="selected"';
+              <option value="<?= $i ?>" <?php if ($refreshinterval == $i) {
+                              echo 'selected="selected"';
 }?>><?= $i ?></option>
-					<?php
+<?php
 } ?>
-        </select>&nbsp; <?= gettext('Seconds') ?><br />&nbsp; &nbsp; &nbsp; <b><?= gettext('Note:') ?></b> <?= gettext('changing this setting will increase CPU utilization') ?><br /><br />
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<input id="submit_settings" name="submit_settings" type="submit" class="formbtn btn btn-primary" value="<?= gettext('Save Settings') ?>" />
-				</td>
-			</tr>
-		</tbody>
-	</table>
+            </select>&nbsp; <?= gettext('Seconds') ?><br />&nbsp; &nbsp; &nbsp; <b><?= gettext('Note:') ?></b> <?= gettext('changing this setting will increase CPU utilization') ?><br /><br />
+          </td>
+        </tr>
+        <tr>
+        <td>
+          <input id="submit_settings" name="submit_settings" type="submit" class="formbtn btn btn-primary" value="<?= gettext('Save Settings') ?>" />
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </form>
 </div>
 
 <script type="text/javascript">
 //<![CDATA[
-	d = document;
-	selectIntLink = "traffic_graphs-configure";
-	textlink = d.getElementById(selectIntLink);
-	textlink.style.display = "inline";
+  d = document;
+  selectIntLink = "traffic_graphs-configure";
+  textlink = d.getElementById(selectIntLink);
+  textlink.style.display = "inline";
 //]]>
 </script>
 
 <?php
-foreach ($ifdescrs as $ifname => $ifdescr) {
+foreach ($ifdescrs as $ifname => $ifdescr):
     $ifinfo = get_interface_info($ifname);
     if ($shown[$ifname]) {
         $mingraphbutton = "inline";
@@ -181,35 +174,27 @@ foreach ($ifdescrs as $ifname => $ifdescr) {
         $graphdisplay = "none";
         $interfacevalue = "hide";
     }
-    if ($ifinfo['status'] != "down") {
+    if ($ifinfo['status'] != "down"):
 ?>
-		<div id="<?=$ifname;?>trafficdiv" style="padding: 5px">
-			<div id="<?=$ifname;?>topic" class="widgetsubheader">
-				<div style="float:left;width:49%">
-					<span onclick="location.href='/status_graph.php?if=<?=$ifname;
-?>'" style="cursor:pointer"><?= sprintf(gettext('Current %s Traffic'),$ifdescr) ?></span>
-				</div>
-				<div align="right" style="float:right;width:49%">
-					<div id="<?=$ifname;?>graphdiv-min" onclick='return trafficminimizeDiv("<?= $ifname ?>", true);'
-						style="display:<?php echo $mingraphbutton;
-?>; cursor:pointer" ><span class="glyphicon glyphicon-minus" alt="Minimize <?=$ifname;?> traffic graph" /></span></div>
-					<div id="<?=$ifname;?>graphdiv-open" onclick='return trafficshowDiv("<?= $ifname ?>", true);'
-						style="display:<?php echo $showgraphbutton;
-?>; cursor:pointer" ><span class="glyphicon glyphicon-plus" alt="Show <?=$ifname;?> traffic graph" /></span></div>
-				</div>
-				<div style="clear:both;"></div>
-			</div>
-			<div id="<?=$ifname;?>graphdiv" style="display:<?= $graphdisplay;?>">
-				<object data="graph.php?ifnum=<?=$ifname;
-?>&amp;ifname=<?=rawurlencode($ifdescr);
-?>&amp;timeint=<?=$refreshinterval;
-?>&amp;initdelay=<?=($graphcounter+1) * 2;?>" height="100%" width="100%">
-					<param name="id" value="graph" />
-					<param name="type" value="image/svg+xml" />
-					<param name="pluginspage" value="http://www.adobe.com/svg/viewer/install/auto" />
-				</object>
-			</div>
-		</div>
-	<?php
-    }
-}
+    <div id="<?=$ifname;?>trafficdiv" style="padding: 5px">
+      <div id="<?=$ifname;?>topic" class="widgetsubheader">
+        <div style="float:left;width:49%">
+          <span onclick="location.href='/status_graph.php?if=<?=$ifname;?>'" style="cursor:pointer"><?= sprintf(gettext('Current %s Traffic'),$ifdescr) ?></span>
+        </div>
+        <div align="right" style="float:right;width:49%">
+          <div id="<?=$ifname;?>graphdiv-min" onclick='return trafficminimizeDiv("<?= $ifname ?>", true);' style="display:<?=$mingraphbutton;?>; cursor:pointer" ><span class="glyphicon glyphicon-minus" alt="Minimize <?=$ifname;?> traffic graph" /></span></div>
+          <div id="<?=$ifname;?>graphdiv-open" onclick='return trafficshowDiv("<?= $ifname ?>", true);' style="display:<?=$showgraphbutton;?>; cursor:pointer" ><span class="glyphicon glyphicon-plus" alt="Show <?=$ifname;?> traffic graph" /></span></div>
+        </div>
+        <div style="clear:both;"></div>
+      </div>
+      <div id="<?=$ifname;?>graphdiv" style="display:<?= $graphdisplay;?>">
+        <object data="graph.php?ifnum=<?=$ifname;?>&amp;ifname=<?=rawurlencode($ifdescr);?>&amp;timeint=<?=$refreshinterval;?>&amp;initdelay=<?=($graphcounter+1) * 2;?>" height="100%" width="100%">
+          <param name="id" value="graph" />
+          <param name="type" value="image/svg+xml" />
+          <param name="pluginspage" value="http://www.adobe.com/svg/viewer/install/auto" />
+        </object>
+      </div>
+    </div>
+<?php
+    endif;
+endforeach;