diff --git a/build/portal/graphs/make-collectd-graphs.sh b/build/portal/graphs/make-collectd-graphs.sh
index 935bb8f..897c550 100755
--- a/build/portal/graphs/make-collectd-graphs.sh
+++ b/build/portal/graphs/make-collectd-graphs.sh
@@ -82,7 +82,8 @@ cpu_graph_dump1090() {
   "CDEF:backgroundp=background,10,/" \
   "AREA:readerp#008000:USB" \
   "AREA:backgroundp#00C000:other:STACK" \
-  "AREA:demodp#00FF00:demodulator:STACK" \
+  "AREA:demodp#00FF00:demodulator\c:STACK" \
+  "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -101,8 +102,13 @@ tracks_graph() {
   "DEF:single=$2/dump1090_tracks-single_message.rrd:value:AVERAGE" \
   "CDEF:hall=all,3600,*" \
   "CDEF:hsingle=single,3600,*" \
+<<<<<<< HEAD
   "AREA:hsingle#FF0000:Tracks with single message" \
   "AREA:hall#00FF00:Unique tracks\c:STACK" \
+=======
+  "AREA:hsingle#FF0000:tracks with single message" \
+  "AREA:hall#00FF00:unique tracks\c:STACK" \
+>>>>>>> 82576755a77e5581c4fedd3e1ee0bad45cadc064
   "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
@@ -113,7 +119,7 @@ cpu_graph() {
   rrdtool graph \
   "$1" \
   --start end-$4 \
-  --width 1110 \
+  --width 1010 \
   --height 200 \
   --step "$5" \
   --title "Overall CPU Utilization" \
@@ -144,7 +150,7 @@ cpu_graph() {
   "AREA:pwait#C00000:io:STACK" \
   "AREA:psystem#FF0000:sys:STACK" \
   "AREA:puser#40FF40:user:STACK" \
-  "AREA:pnice#008000:nice:STACK" \
+  "AREA:pnice#008000:nice\c:STACK" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -152,7 +158,7 @@ df_root_graph() {
   rrdtool graph \
   "$1" \
   --start end-$4 \
-  --width 480 \
+  --width 496 \
   --height 200 \
   --step "$5" \
   --title "Disk Usage (/)" \
@@ -164,7 +170,8 @@ df_root_graph() {
   "DEF:free=$2/df_complex-free.rrd:value:AVERAGE" \
   "CDEF:totalused=used,reserved,+" \
   "AREA:totalused#4169E1:used:STACK" \
-  "AREA:free#32C734:free:STACK" \
+  "AREA:free#32C734:free\c:STACK" \
+  "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -192,7 +199,6 @@ disk_io_iops_graph() {
   "GPRINT:write:MAX:Max\:%4.1lf iops" \
   "GPRINT:write:AVERAGE:Avg\:%4.1lf iops" \
   "GPRINT:write:LAST:Current\:%4.1lf iops\c" \
-  "HRULE:0#000000" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -220,7 +226,6 @@ disk_io_octets_graph() {
   "GPRINT:write:MAX:Max\: %4.1lf %sB/sec" \
   "GPRINT:write:AVERAGE:Avg\: %4.1lf %SB/sec" \
   "GPRINT:write:LAST:Current\: %4.1lf %SB/sec\c" \
-  "HRULE:0#000000" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -241,13 +246,12 @@ eth0_graph() {
   "LINE1:rx#336600" \
   "GPRINT:rx:MAX:Max\:%8.1lf %s" \
   "GPRINT:rx:AVERAGE:Avg\:%8.1lf %S" \
-  "GPRINT:rx:LAST:Current\:%8.1lf %Sbytes/sec\n" \
+  "GPRINT:rx:LAST:Current\:%8.1lf %Sbytes/sec\c" \
   "AREA:tx_neg#4169E1:Outgoing" \
   "LINE1:tx_neg#0033CC" \
   "GPRINT:tx:MAX:Max\:%8.1lf %S" \
   "GPRINT:tx:AVERAGE:Avg\:%8.1lf %S" \
-  "GPRINT:tx:LAST:Current\:%8.1lf %Sbytes/sec\n" \
-  "HRULE:0#000000" \
+  "GPRINT:tx:LAST:Current\:%8.1lf %Sbytes/sec\c" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -255,7 +259,7 @@ memory_graph() {
   rrdtool graph \
   "$1" \
   --start end-$4 \
-  --width 480 \
+  --width 496 \
   --height 200 \
   --step "$5" \
   --title "Memory Utilization" \
@@ -268,7 +272,8 @@ memory_graph() {
   "AREA:used#4169E1:used:STACK" \
   "AREA:buffered#32C734:buffered:STACK" \
   "AREA:cached#00FF00:cached:STACK" \
-  "AREA:free#FFFFFF:free:STACK" \
+  "AREA:free#FFFFFF:free\c:STACK" \
+  "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -290,6 +295,8 @@ temp_graph_imperial() {
   "CDEF:ttb=tta,1.8,*" \
   "CDEF:ttc=ttb,32,+" \
   "AREA:ttc#ffcc00" \
+  "COMMENT: \n" \
+  "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -309,6 +316,8 @@ temp_graph_metric() {
   "DEF:traw=$2/gauge-cpu_temp.rrd:value:MAX" \
   "CDEF:tfin=traw,1000,/" \
   "AREA:tfin#ffcc00" \
+  "COMMENT: \n" \
+  "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -329,13 +338,12 @@ wlan0_graph() {
   "LINE1:rx#336600" \
   "GPRINT:rx:MAX:Max\:%8.1lf %s" \
   "GPRINT:rx:AVERAGE:Avg\:%8.1lf %S" \
-  "GPRINT:rx:LAST:Current\:%8.1lf %Sbytes/sec\n" \
+  "GPRINT:rx:LAST:Current\:%8.1lf %Sbytes/sec\c" \
   "AREA:tx_neg#4169E1:Outgoing" \
   "LINE1:tx_neg#0033CC" \
   "GPRINT:tx:MAX:Max\:%8.1lf %S" \
   "GPRINT:tx:AVERAGE:Avg\:%8.1lf %S" \
-  "GPRINT:tx:LAST:Current\:%8.1lf %Sbytes/sec\n" \
-  "HRULE:0#000000" \
+  "GPRINT:tx:LAST:Current\:%8.1lf %Sbytes/sec\c" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -345,7 +353,7 @@ local_rate_graph() {
   rrdtool graph \
   "$1" \
   --start end-$4 \
-  --width 480 \
+  --width 429 \
   --height 200 \
   --step "$5" \
   --title "$3 Message Rate" \
@@ -360,7 +368,8 @@ local_rate_graph() {
   "CDEF:y2positions=positions,10,*" \
   "LINE1:messages#0000FF:messages received" \
   "AREA:y2strong#FF0000:messages >-3dBFS / hr (RHS)" \
-  "LINE1:y2positions#00c0FF:positions / hr (RHS)" \
+  "LINE1:y2positions#00c0FF:positions / hr (RHS)\c" \
+  "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -460,6 +469,7 @@ local_trailing_rate_graph() {
   "CDEF:max5=max3,gmax1,MAX" \
   "CDEF:max=max4,max5,MAX" \
   "CDEF:maxarea=max,min,-" \
+<<<<<<< HEAD
   "LINE1:messages#0000FF:Messages Received" \
   "LINE1:min#FFFF99" \
   "AREA:maxarea#FFFF99:Min/Max:STACK" \
@@ -467,6 +477,14 @@ local_trailing_rate_graph() {
   "LINE1:messages#0000FF" \
   "AREA:y2strong#FF0000:Messages > -3dBFS/Hr (RHS)" \
   "LINE1:y2positions#00c0FF:Positions/Hr (RHS)\c" \
+=======
+  "LINE1:min#FFFF99:mins" \
+  "AREA:maxarea#FFFF99:max:STACK" \
+  "LINE1:7dayaverage#00FF00:7 Day Average" \
+  "AREA:y2strong#FF0000:messages >-3dBFS/Hr (RHS)" \
+  "LINE1:y2positions#00c0FF:Positions/Hr (RHS)" \
+  "LINE1:messages#0000FF:Messages Received\c" \
+>>>>>>> 82576755a77e5581c4fedd3e1ee0bad45cadc064
   --watermark "Drawn: $nowlit";
 }
 
@@ -474,7 +492,7 @@ range_graph_imperial(){
   rrdtool graph \
   "$1" \
   --start end-$4 \
-  --width 480 \
+  --width 428 \
   --height 200 \
   --step "$5" \
   --title "$3 Max Range" \
@@ -491,7 +509,8 @@ range_graph_imperial(){
   "VDEF:peakrange=rangenm,MAXIMUM" \
   "GPRINT:avgrange:%1.1lf NM" \
   "LINE1:peakrange#FF0000:Peak Range\\:" \
-  "GPRINT:peakrange:%1.1lf NM" \
+  "GPRINT:peakrange:%1.1lf NM\c" \
+  "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -499,7 +518,7 @@ range_graph_metric() {
   rrdtool graph \
   "$1" \
   --start end-$4 \
-  --width 480 \
+  --width 428 \
   --height 200 \
   --step "$5" \
   --title "$3 Max Range" \
@@ -516,7 +535,8 @@ range_graph_metric() {
   "GPRINT:avgrange:%1.1lf km" \
   "LINE1:peakrange#FF0000:Peak Range\\:" \
   "GPRINT:peakrange:%1.1lf km" \
-  "LINE1:463#000000:250 NM" \
+  "LINE1:463#000000:250 NM\c" \
+  "COMMENT: \n" \
   --watermark "Drawn: $nowlit";
 }
 
@@ -525,7 +545,7 @@ signal_graph() {
   "$1" \
   --start end-$4 \
   --width 480 \
-  --height 200 \
+  --height 186 \
   --step "$5" \
   --title "$3 Signal Level" \
   --vertical-label "dBFS" \
@@ -542,13 +562,13 @@ signal_graph() {
   "AREA:us#FFFFFF" \
   "GPRINT:signal:AVERAGE:%4.1lf" \
   "LINE1:peak#0000FF:Peak Level\:" \
-  "GPRINT:peak:MAX:%4.1lf\n" \
+  "GPRINT:peak:MAX:%4.1lf\c" \
   "LINE:noise#7F00FF:Noise" \
   "GPRINT:noise:MAX:Max\: %4.1lf" \
   "GPRINT:noise:MIN:Min\: %4.1lf" \
-  "GPRINT:noise:AVERAGE:Avg\: %4.1lf\n" \
+  "GPRINT:noise:AVERAGE:Avg\: %4.1lf\c" \
   "LINE1:0#000000:Zero dBFS" \
-  "LINE1:-3#FF0000:-3 dBFS\n" \
+  "LINE1:-3#FF0000:-3 dBFS\c" \
   --watermark "Drawn: $nowlit";
 }