diff --git a/Python server/pos-python-server.py b/Python server/pos-python-server.py
index 6abaa11808a6c87aaeac3a136951eb2ce58778f0..1bfd18ac59e9857fe8117f99237dad1251ca4d48 100755
--- a/Python server/pos-python-server.py	
+++ b/Python server/pos-python-server.py	
@@ -363,9 +363,9 @@ class myHandler(BaseHTTPRequestHandler):
                     for i in archiver_dict:
                         archiver_stat = archiver_stat + i + ' = '+ archiver_dict[i]+'\n'
                     pvinfo['archiver']=archiver_stat.replace('\n','<br>')
-                    pvinfo['live_view']='http://live.pos.esss.lu.se/live_view?PV='+path[1]
+                    pvinfo['live_view']='https://live.pos.esss.lu.se/live_view?PV='+path[1]
                     if archiver_dict['status'] == 'Being archived':
-                        pvinfo['link']='<a target="_blank" href="http://plot.pos.esss.lu.se/retrieval/ui/viewer/archViewer.html?pv='+path[1]+'">See archived data</a>'
+                        pvinfo['link']='<a target="_blank" href="https://plot.pos.esss.lu.se/retrieval/ui/viewer/archViewer.html?pv='+path[1]+'">See archived data</a>'
                     self.wfile.write(bytes(json.dumps(pvinfo), "utf-8"))
                     return
                 except:
@@ -433,9 +433,9 @@ class myHandler(BaseHTTPRequestHandler):
                     for i in archiver_dict:
                         archiver_stat = archiver_stat + i + ' = '+ archiver_dict[i]+'\n'
                     pvinfo['archiver']=archiver_stat
-                    pvinfo['live_view']='http://live.pos.esss.lu.se/live_view?PV='+path[1]
+                    pvinfo['live_view']='https://live.pos.esss.lu.se/live_view?PV='+path[1]
                     if archiver_dict['status'] == 'Being archived':
-                        pvinfo['link']='http://plot.pos.esss.lu.se/retrieval/ui/viewer/archViewer.html?pv='+path[1]
+                        pvinfo['link']='https://plot.pos.esss.lu.se/retrieval/ui/viewer/archViewer.html?pv='+path[1]
                     self.wfile.write(bytes(json.dumps(pvinfo), "utf-8"))
                     return
                 except:
diff --git a/Web sites/instruments/dashboard-good.json b/Web sites/instruments/dashboard-good.json
deleted file mode 100644
index 45a12216adb12563967cd5b9bfc657f8c234a6f8..0000000000000000000000000000000000000000
--- a/Web sites/instruments/dashboard-good.json	
+++ /dev/null
@@ -1,396 +0,0 @@
-{
-	"version": 1,
-	"header_image": "",
-	"allow_edit": false,
-	"plugins": [],
-	"panes": [
-		{
-			"width": 1,
-			"row": {
-				"1": 1,
-				"2": 1,
-				"3": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1
-			},
-			"col_width": 3,
-			"widgets": [
-				{
-					"type": "html",
-					"settings": {
-						"html": "return \"<div style=\\\"position: static; margin-top: -15px;\\\"><img src=\\\"../img/ess-logo.svg\\\" \\\"><div class=\\\"tw-value\\\" style=\\\"font-size: 56px; color:#ffffff !important;position: relative; bottom: 35px; left: 30px;\\\">Public Operations Screen</div></img></div>\"",
-						"height": 2
-					}
-				}
-			]
-		},
-		{
-			"title": "Shift Leader",
-			"width": 1,
-			"row": {
-				"1": 11,
-				"2": 7,
-				"3": 7,
-				"5": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"NSO-LCR:Ops:MSL\"][\"value\"]",
-						"animate": true
-					}
-				}
-			]
-		},
-		{
-			"title": "LCR Messages",
-			"width": 1,
-			"row": {
-				"1": 15,
-				"2": 11,
-				"3": 7,
-				"5": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 3,
-				"5": 3
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "html",
-					"settings": {
-						"html": "return \"<div class=\\\"tw-value\\\" style=\\\"font-size: 16px; width=100%; margin-top:10px; margin-left:10px; margin-right:10px;\\\">\"+ datasources[\"Public Data\"][\"NSO-LCR:Ops:Msg\"][\"value\"] +\"</div>\"",
-						"height": 1
-					}
-				}
-			]
-		},
-		{
-			"title": "Shift ID",
-			"width": 1,
-			"row": {
-				"1": 7,
-				"2": 7,
-				"3": 7,
-				"5": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"5": 1
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"NSO-LCR:Ops:SID\"][\"value\"]",
-						"animate": false
-					}
-				}
-			]
-		},
-		{
-			"title": "Ion Source",
-			"width": 1,
-			"row": {
-				"1": 23,
-				"2": 15,
-				"3": 11,
-				"4": 1,
-				"5": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 1,
-				"5": 1
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Magnetron",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:Setup.B6\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:PulsHLvlS\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:PulsHLvlS\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 1",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 2",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 3",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Repeller",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:VolR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:VolR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "High Voltage",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:VolR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:VolR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "LEBT",
-			"width": 1,
-			"row": {
-				"1": 47,
-				"2": 25,
-				"3": 11,
-				"4": 1,
-				"5": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 3,
-				"4": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Solenoid 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Horizontal Steerer 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Vertical Steerer 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Solenoid 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Horizontal Steerer 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Vertical Steerer 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "Ion Source",
-			"width": 1,
-			"row": {
-				"1": 37,
-				"2": 15,
-				"3": 11,
-				"5": 11
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Frequency",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:TS-EVG-01:Mxc1-Frequency-RB\"][\"value\"]",
-						"animate": true,
-						"units": " Hz"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Pulse Length",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-EVR-Magtr:Pul0-Width-RB\"][\"value\"]",
-						"animate": true,
-						"units": "&#181;s"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Hydrogen",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:Vac-VVMC-01100:FlwR\"][\"value\"]",
-						"animate": true,
-						"units": "sccm"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Nitrogen",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:Vac-VVMC-01100:FlwR\"][\"value\"]",
-						"animate": true,
-						"units": "sccm"
-					}
-				}
-			]
-		},
-		{
-			"title": "Beam Status",
-			"width": 1,
-			"row": {
-				"1": 19,
-				"2": 11,
-				"3": 21,
-				"5": 21
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"value": "datasources[\"Public Data\"][\"beam\"]",
-						"on_text": "Beam is On",
-						"off_text": "Beam is Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "Beam Current",
-			"width": 1,
-			"row": {
-				"1": 61,
-				"2": 39,
-				"3": 25,
-				"4": 1,
-				"5": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 3,
-				"5": 3
-			},
-			"col_width": 3,
-			"widgets": [
-				{
-					"type": "flot_extended_plugin",
-					"settings": {
-						"plot_type": "line",
-						"legend": true,
-						"height": 4,
-						"value": "[{label: 'Ion Source', data:datasources[\"Public Data\"][\"ISrc-010:PBI-BCM-001:AI4-Compressed\"][\"value\"]}, {label: 'Faraday Cup', data:datasources[\"Public Data\"][\"LEBT-010:PBI-FC-001:AMC31-AOI11-ArrayData\"][\"value\"]}, {label: 'LEBT', data:datasources[\"Public Data\"][\"LEBT-010:PBI-BCM-001:AI5-Compressed\"][\"value\"]}]",
-						"xticks": "",
-						"yticks": "",
-						"points": false,
-						"tooltip": false,
-						"zoom": "xy",
-						"axisLabels": "xaxes: [{axisLabel: 'test'}]"
-					}
-				}
-			]
-		}
-	],
-	"datasources": [
-		{
-			"name": "Public Data",
-			"type": "JSON",
-			"settings": {
-				"url": "http://data.pos.esss.lu.se/getPublicData",
-				"use_thingproxy": false,
-				"refresh": 5,
-				"method": "GET"
-			}
-		}
-	],
-	"columns": 3
-}
diff --git a/Web sites/instruments/dashboard.json b/Web sites/instruments/dashboard.json
index c6adb0b375ded69af514035d162212500258672f..bf022b7ba88b233771ddb6c9f74964217082697b 100644
--- a/Web sites/instruments/dashboard.json	
+++ b/Web sites/instruments/dashboard.json	
@@ -96,7 +96,7 @@
 				{
 					"type": "html",
 					"settings": {
-						"html": "<img width=\"100%\" height=\"100%\" id=\"npmhImage\", src=\"http://data.pos.esss.lu.se/npm-himage.png\"></img>\n<script>\n    setInterval(function() { \n        var npmhImage = document.getElementById('npmhImage'); \n        npmhImage.src = 'http://data.pos.esss.lu.se/npm-himage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
+						"html": "<img width=\"100%\" height=\"100%\" id=\"npmhImage\", src=\"https://data.pos.esss.lu.se/npm-himage.png\"></img>\n<script>\n    setInterval(function() { \n        var npmhImage = document.getElementById('npmhImage'); \n        npmhImage.src = 'https://data.pos.esss.lu.se/npm-himage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
 						"height": 4
 					}
 				},
@@ -139,7 +139,7 @@
 				{
 					"type": "html",
 					"settings": {
-						"html": "<img width=\"100%\" height=\"100%\" id=\"npmvImage\", src=\"http://data.pos.esss.lu.se/npm-vimage.png\"></img>\n<script>\n    setInterval(function() { \n        var npmvImage = document.getElementById('npmvImage'); \n        npmvImage.src = 'http://data.pos.esss.lu.se/npm-vimage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
+						"html": "<img width=\"100%\" height=\"100%\" id=\"npmvImage\", src=\"https://data.pos.esss.lu.se/npm-vimage.png\"></img>\n<script>\n    setInterval(function() { \n        var npmvImage = document.getElementById('npmvImage'); \n        npmvImage.src = 'https://data.pos.esss.lu.se/npm-vimage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
 						"height": 4
 					}
 				},
@@ -180,7 +180,7 @@
 				{
 					"type": "html",
 					"settings": {
-						"html": "<img width=\"100%\" height=\"100%\" id=\"emuvImage\", src=\"http://data.pos.esss.lu.se/emu-vimage.png\"></img>\n<script>\n    setInterval(function() { \n        var emuvImage = document.getElementById('emuvImage'); \n        emuvImage.src = 'http://data.pos.esss.lu.se/emu-vimage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
+						"html": "<img width=\"100%\" height=\"100%\" id=\"emuvImage\", src=\"https://data.pos.esss.lu.se/emu-vimage.png\"></img>\n<script>\n    setInterval(function() { \n        var emuvImage = document.getElementById('emuvImage'); \n        emuvImage.src = 'https://data.pos.esss.lu.se/emu-vimage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
 						"height": 4
 					}
 				}
@@ -208,7 +208,7 @@
 				{
 					"type": "html",
 					"settings": {
-						"html": "<img width=\"100%\" height=\"100%\" id=\"emuhImage\", src=\"http://data.pos.esss.lu.se/emu-himage.png\"></img>\n<script>\n    setInterval(function() { \n        var emuhImage = document.getElementById('emuhImage'); \n        emuhImage.src = 'http://data.pos.esss.lu.se/emu-himage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
+						"html": "<img width=\"100%\" height=\"100%\" id=\"emuhImage\", src=\"https://data.pos.esss.lu.se/emu-himage.png\"></img>\n<script>\n    setInterval(function() { \n        var emuhImage = document.getElementById('emuhImage'); \n        emuhImage.src = 'https://data.pos.esss.lu.se/emu-himage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
 						"height": 4
 					}
 				}
@@ -220,7 +220,7 @@
 			"name": "Instruments",
 			"type": "JSON",
 			"settings": {
-				"url": "http://data.pos.esss.lu.se/getInstruments",
+				"url": "https://data.pos.esss.lu.se/getInstruments",
 				"use_thingproxy": false,
 				"refresh": 1,
 				"method": "GET"
diff --git a/Web sites/interlocks/dashboard-good.json b/Web sites/interlocks/dashboard-good.json
deleted file mode 100644
index 1676e7f043fa0220182ee2e8c2a51fa9394569f2..0000000000000000000000000000000000000000
--- a/Web sites/interlocks/dashboard-good.json	
+++ /dev/null
@@ -1,344 +0,0 @@
-{
-	"version": 1,
-	"header_image": "",
-	"allow_edit": true,
-	"plugins": [],
-	"panes": [
-		{
-			"title": "Shift ID",
-			"width": 1,
-			"row": {
-				"3": 7
-			},
-			"col": {
-				"3": 1
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"NSO-LCR:Ops:SID\"][\"value\"]",
-						"animate": false
-					}
-				}
-			]
-		},
-		{
-			"title": "Shift Leader",
-			"width": 1,
-			"row": {
-				"3": 7
-			},
-			"col": {
-				"3": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"NSO-LCR:Ops:MSL\"][\"value\"]",
-						"animate": true
-					}
-				}
-			]
-		},
-		{
-			"title": "LCR Messages",
-			"width": 1,
-			"row": {
-				"3": 7
-			},
-			"col": {
-				"3": 3
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "html",
-					"settings": {
-						"html": "return \"<div class=\\\"tw-value\\\" style=\\\"font-size: 16px; width=100%; margin-top:10px; margin-left:10px; margin-right:10px;\\\">\"+ datasources[\"Public Data\"][\"NSO-LCR:Ops:Msg\"][\"value\"] +\"</div>\"",
-						"height": 1
-					}
-				}
-			]
-		},
-		{
-			"title": "Ion Source",
-			"width": 1,
-			"row": {
-				"3": 11,
-				"4": 1
-			},
-			"col": {
-				"3": 1,
-				"4": 1
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Magnetron",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:Setup.B6\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:PulsHLvlS\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:PulsHLvlS\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 1",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 2",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 3",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Repeller",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:VolR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:VolR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "High Voltage",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:VolR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:VolR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "LEBT",
-			"width": 1,
-			"row": {
-				"3": 11,
-				"4": 1
-			},
-			"col": {
-				"3": 3,
-				"4": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Solenoid 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Horizontal Steerer 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Vertical Steerer 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Solenoid 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Horizontal Steerer 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Vertical Steerer 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "Ion Source",
-			"width": 1,
-			"row": {
-				"3": 11
-			},
-			"col": {
-				"3": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Frequency",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:TS-EVG-01:Mxc1-Frequency-RB\"][\"value\"]",
-						"animate": true,
-						"units": " Hz"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Pulse Length",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-EVR-Magtr:Pul0-Width-RB\"][\"value\"]",
-						"animate": true,
-						"units": "&#181;s"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Hydrogen",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:Vac-VVMC-01100:FlwR\"][\"value\"]",
-						"animate": true,
-						"units": "sccm"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Nitrogen",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:Vac-VVMC-01100:FlwR\"][\"value\"]",
-						"animate": true,
-						"units": "sccm"
-					}
-				}
-			]
-		},
-		{
-			"title": "Beam Status",
-			"width": 1,
-			"row": {
-				"3": 21
-			},
-			"col": {
-				"3": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"value": "datasources[\"Public Data\"][\"beam\"]",
-						"on_text": "Beam is On",
-						"off_text": "Beam is Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "Beam Current",
-			"width": 1,
-			"row": {
-				"3": 25,
-				"4": 1
-			},
-			"col": {
-				"3": 1,
-				"4": 3
-			},
-			"col_width": 3,
-			"widgets": [
-				{
-					"type": "flot_extended_plugin",
-					"settings": {
-						"plot_type": "line",
-						"legend": true,
-						"height": 4,
-						"value": "[{label: 'Ion Source', data:datasources[\"Public Data\"][\"ISrc-010:PBI-BCM-001:AI4-Compressed\"][\"value\"]}, {label: 'Faraday Cup', data:datasources[\"Public Data\"][\"LEBT-010:PBI-FC-001:AMC31-AOI11-ArrayData\"][\"value\"]}, {label: 'LEBT', data:datasources[\"Public Data\"][\"LEBT-010:PBI-BCM-001:AI5-Compressed\"][\"value\"]}]",
-						"xticks": "",
-						"yticks": "",
-						"points": false,
-						"tooltip": false,
-						"zoom": "xy",
-						"axisLabels": "xaxes: [{axisLabel: 'test'}]"
-					}
-				}
-			]
-		},
-		{
-			"width": 1,
-			"row": {
-				"3": 1
-			},
-			"col": {
-				"3": 1
-			},
-			"col_width": 3,
-			"widgets": [
-				{
-					"type": "html",
-					"settings": {
-						"html": "return \"<div style=\\\"position: static; margin-top: -15px;\\\"><img src=\\\"../img/ess-logo.svg\\\" \\\"><div class=\\\"tw-value\\\" style=\\\"font-size: 56px; color:#ffffff !important;position: relative; bottom: 60px; left: 30px;\\\">Public Operations Screen</div></img></div>\"",
-						"height": 2
-					}
-				}
-			]
-		}
-	],
-	"datasources": [
-		{
-			"name": "Public Data",
-			"type": "JSON",
-			"settings": {
-				"url": "http://data.pos.esss.lu.se/getPublicData",
-				"use_thingproxy": false,
-				"refresh": 5,
-				"method": "GET"
-			}
-		}
-	],
-	"columns": 3
-}
diff --git a/Web sites/interlocks/dashboard.json b/Web sites/interlocks/dashboard.json
index 05192dc60d664dbe44da76fac6be81dd8b2c104f..b6d69f388e352bb1118234ddf88d52ce69a856fc 100644
--- a/Web sites/interlocks/dashboard.json	
+++ b/Web sites/interlocks/dashboard.json	
@@ -148,7 +148,7 @@
                         "name": "Public Data",
                         "type": "JSON",
                         "settings": {
-                                "url": "http://data.pos.esss.lu.se/getInterlocks",
+                                "url": "https://data.pos.esss.lu.se/getInterlocks",
                                 "use_thingproxy": false,
                                 "refresh": 1,
                                 "method": "GET"
diff --git a/Web sites/pos-dev/dashboard-good.json b/Web sites/pos-dev/dashboard-good.json
deleted file mode 100644
index 45a12216adb12563967cd5b9bfc657f8c234a6f8..0000000000000000000000000000000000000000
--- a/Web sites/pos-dev/dashboard-good.json	
+++ /dev/null
@@ -1,396 +0,0 @@
-{
-	"version": 1,
-	"header_image": "",
-	"allow_edit": false,
-	"plugins": [],
-	"panes": [
-		{
-			"width": 1,
-			"row": {
-				"1": 1,
-				"2": 1,
-				"3": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1
-			},
-			"col_width": 3,
-			"widgets": [
-				{
-					"type": "html",
-					"settings": {
-						"html": "return \"<div style=\\\"position: static; margin-top: -15px;\\\"><img src=\\\"../img/ess-logo.svg\\\" \\\"><div class=\\\"tw-value\\\" style=\\\"font-size: 56px; color:#ffffff !important;position: relative; bottom: 35px; left: 30px;\\\">Public Operations Screen</div></img></div>\"",
-						"height": 2
-					}
-				}
-			]
-		},
-		{
-			"title": "Shift Leader",
-			"width": 1,
-			"row": {
-				"1": 11,
-				"2": 7,
-				"3": 7,
-				"5": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"NSO-LCR:Ops:MSL\"][\"value\"]",
-						"animate": true
-					}
-				}
-			]
-		},
-		{
-			"title": "LCR Messages",
-			"width": 1,
-			"row": {
-				"1": 15,
-				"2": 11,
-				"3": 7,
-				"5": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 3,
-				"5": 3
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "html",
-					"settings": {
-						"html": "return \"<div class=\\\"tw-value\\\" style=\\\"font-size: 16px; width=100%; margin-top:10px; margin-left:10px; margin-right:10px;\\\">\"+ datasources[\"Public Data\"][\"NSO-LCR:Ops:Msg\"][\"value\"] +\"</div>\"",
-						"height": 1
-					}
-				}
-			]
-		},
-		{
-			"title": "Shift ID",
-			"width": 1,
-			"row": {
-				"1": 7,
-				"2": 7,
-				"3": 7,
-				"5": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"5": 1
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"NSO-LCR:Ops:SID\"][\"value\"]",
-						"animate": false
-					}
-				}
-			]
-		},
-		{
-			"title": "Ion Source",
-			"width": 1,
-			"row": {
-				"1": 23,
-				"2": 15,
-				"3": 11,
-				"4": 1,
-				"5": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 1,
-				"5": 1
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Magnetron",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:Setup.B6\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:PulsHLvlS\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:PulsHLvlS\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 1",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 2",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 3",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Repeller",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:VolR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:VolR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "High Voltage",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:VolR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:VolR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "LEBT",
-			"width": 1,
-			"row": {
-				"1": 47,
-				"2": 25,
-				"3": 11,
-				"4": 1,
-				"5": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 3,
-				"4": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Solenoid 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Horizontal Steerer 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Vertical Steerer 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Solenoid 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Horizontal Steerer 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Vertical Steerer 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "Ion Source",
-			"width": 1,
-			"row": {
-				"1": 37,
-				"2": 15,
-				"3": 11,
-				"5": 11
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Frequency",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:TS-EVG-01:Mxc1-Frequency-RB\"][\"value\"]",
-						"animate": true,
-						"units": " Hz"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Pulse Length",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-EVR-Magtr:Pul0-Width-RB\"][\"value\"]",
-						"animate": true,
-						"units": "&#181;s"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Hydrogen",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:Vac-VVMC-01100:FlwR\"][\"value\"]",
-						"animate": true,
-						"units": "sccm"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Nitrogen",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:Vac-VVMC-01100:FlwR\"][\"value\"]",
-						"animate": true,
-						"units": "sccm"
-					}
-				}
-			]
-		},
-		{
-			"title": "Beam Status",
-			"width": 1,
-			"row": {
-				"1": 19,
-				"2": 11,
-				"3": 21,
-				"5": 21
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"value": "datasources[\"Public Data\"][\"beam\"]",
-						"on_text": "Beam is On",
-						"off_text": "Beam is Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "Beam Current",
-			"width": 1,
-			"row": {
-				"1": 61,
-				"2": 39,
-				"3": 25,
-				"4": 1,
-				"5": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 3,
-				"5": 3
-			},
-			"col_width": 3,
-			"widgets": [
-				{
-					"type": "flot_extended_plugin",
-					"settings": {
-						"plot_type": "line",
-						"legend": true,
-						"height": 4,
-						"value": "[{label: 'Ion Source', data:datasources[\"Public Data\"][\"ISrc-010:PBI-BCM-001:AI4-Compressed\"][\"value\"]}, {label: 'Faraday Cup', data:datasources[\"Public Data\"][\"LEBT-010:PBI-FC-001:AMC31-AOI11-ArrayData\"][\"value\"]}, {label: 'LEBT', data:datasources[\"Public Data\"][\"LEBT-010:PBI-BCM-001:AI5-Compressed\"][\"value\"]}]",
-						"xticks": "",
-						"yticks": "",
-						"points": false,
-						"tooltip": false,
-						"zoom": "xy",
-						"axisLabels": "xaxes: [{axisLabel: 'test'}]"
-					}
-				}
-			]
-		}
-	],
-	"datasources": [
-		{
-			"name": "Public Data",
-			"type": "JSON",
-			"settings": {
-				"url": "http://data.pos.esss.lu.se/getPublicData",
-				"use_thingproxy": false,
-				"refresh": 5,
-				"method": "GET"
-			}
-		}
-	],
-	"columns": 3
-}
diff --git a/Web sites/pos-dev/dashboard.json b/Web sites/pos-dev/dashboard.json
index 67d5270d754cdca082c4ae1ec8ce04efebc737ce..fcbcb2013dfb99654f9ab5bb6832e4a2cefd97f9 100644
--- a/Web sites/pos-dev/dashboard.json	
+++ b/Web sites/pos-dev/dashboard.json	
@@ -94,7 +94,7 @@
 				{
 					"type": "html",
 					"settings": {
-						"html": "<img width=\"100%\" height=\"100%\" id=\"npmhImage\", src=\"http://data.pos.esss.lu.se/npm-himage.png\"></img>\n<script>\n    setInterval(function() { \n        var npmhImage = document.getElementById('npmhImage'); \n        npmhImage.src = 'http://data.pos.esss.lu.se/npm-himage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
+						"html": "<img width=\"100%\" height=\"100%\" id=\"npmhImage\", src=\"https://data.pos.esss.lu.se/npm-himage.png\"></img>\n<script>\n    setInterval(function() { \n        var npmhImage = document.getElementById('npmhImage'); \n        npmhImage.src = 'https://data.pos.esss.lu.se/npm-himage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
 						"height": 4
 					}
 				},
@@ -135,7 +135,7 @@
 				{
 					"type": "html",
 					"settings": {
-						"html": "<img width=\"100%\" height=\"100%\" id=\"npmvImage\", src=\"http://data.pos.esss.lu.se/npm-vimage.png\"></img>\n<script>\n    setInterval(function() { \n        var npmvImage = document.getElementById('npmvImage'); \n        npmvImage.src = 'http://data.pos.esss.lu.se/npm-vimage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
+						"html": "<img width=\"100%\" height=\"100%\" id=\"npmvImage\", src=\"https://data.pos.esss.lu.se/npm-vimage.png\"></img>\n<script>\n    setInterval(function() { \n        var npmvImage = document.getElementById('npmvImage'); \n        npmvImage.src = 'https://data.pos.esss.lu.se/npm-vimage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
 						"height": 4
 					}
 				},
@@ -170,7 +170,7 @@
 				{
 					"type": "html",
 					"settings": {
-						"html": "<img width=\"100%\" height=\"100%\" id=\"emuImage\", src=\"http://data.pos.esss.lu.se/emu-vimage.png\"></img>\n<script>\n    setInterval(function() { \n        var emuImage = document.getElementById('emuImage'); \n        emuImage.src = 'http://data.pos.esss.lu.se/emu-vimage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
+						"html": "<img width=\"100%\" height=\"100%\" id=\"emuImage\", src=\"https://data.pos.esss.lu.se/emu-vimage.png\"></img>\n<script>\n    setInterval(function() { \n        var emuImage = document.getElementById('emuImage'); \n        emuImage.src = 'https://data.pos.esss.lu.se/emu-vimage.png?rnd=' + Math.random(); \n    }, 1000); \n</script>",
 						"height": 4
 					}
 				}
@@ -182,7 +182,7 @@
 			"name": "Instruments",
 			"type": "JSON",
 			"settings": {
-				"url": "http://data.pos.esss.lu.se/getInstruments",
+				"url": "https://data.pos.esss.lu.se/getInstruments",
 				"use_thingproxy": false,
 				"refresh": 1,
 				"method": "GET"
diff --git a/Web sites/pos/dashboard-good.json b/Web sites/pos/dashboard-good.json
deleted file mode 100644
index 45a12216adb12563967cd5b9bfc657f8c234a6f8..0000000000000000000000000000000000000000
--- a/Web sites/pos/dashboard-good.json	
+++ /dev/null
@@ -1,396 +0,0 @@
-{
-	"version": 1,
-	"header_image": "",
-	"allow_edit": false,
-	"plugins": [],
-	"panes": [
-		{
-			"width": 1,
-			"row": {
-				"1": 1,
-				"2": 1,
-				"3": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1
-			},
-			"col_width": 3,
-			"widgets": [
-				{
-					"type": "html",
-					"settings": {
-						"html": "return \"<div style=\\\"position: static; margin-top: -15px;\\\"><img src=\\\"../img/ess-logo.svg\\\" \\\"><div class=\\\"tw-value\\\" style=\\\"font-size: 56px; color:#ffffff !important;position: relative; bottom: 35px; left: 30px;\\\">Public Operations Screen</div></img></div>\"",
-						"height": 2
-					}
-				}
-			]
-		},
-		{
-			"title": "Shift Leader",
-			"width": 1,
-			"row": {
-				"1": 11,
-				"2": 7,
-				"3": 7,
-				"5": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"NSO-LCR:Ops:MSL\"][\"value\"]",
-						"animate": true
-					}
-				}
-			]
-		},
-		{
-			"title": "LCR Messages",
-			"width": 1,
-			"row": {
-				"1": 15,
-				"2": 11,
-				"3": 7,
-				"5": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 3,
-				"5": 3
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "html",
-					"settings": {
-						"html": "return \"<div class=\\\"tw-value\\\" style=\\\"font-size: 16px; width=100%; margin-top:10px; margin-left:10px; margin-right:10px;\\\">\"+ datasources[\"Public Data\"][\"NSO-LCR:Ops:Msg\"][\"value\"] +\"</div>\"",
-						"height": 1
-					}
-				}
-			]
-		},
-		{
-			"title": "Shift ID",
-			"width": 1,
-			"row": {
-				"1": 7,
-				"2": 7,
-				"3": 7,
-				"5": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"5": 1
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"NSO-LCR:Ops:SID\"][\"value\"]",
-						"animate": false
-					}
-				}
-			]
-		},
-		{
-			"title": "Ion Source",
-			"width": 1,
-			"row": {
-				"1": 23,
-				"2": 15,
-				"3": 11,
-				"4": 1,
-				"5": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 1,
-				"5": 1
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Magnetron",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:Setup.B6\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:PulsHLvlS\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:PulsHLvlS\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 1",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 2",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 3",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Repeller",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:VolR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:VolR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "High Voltage",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:VolR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:VolR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "LEBT",
-			"width": 1,
-			"row": {
-				"1": 47,
-				"2": 25,
-				"3": 11,
-				"4": 1,
-				"5": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 3,
-				"4": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Solenoid 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Horizontal Steerer 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Vertical Steerer 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Solenoid 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Horizontal Steerer 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Vertical Steerer 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "Ion Source",
-			"width": 1,
-			"row": {
-				"1": 37,
-				"2": 15,
-				"3": 11,
-				"5": 11
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Frequency",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:TS-EVG-01:Mxc1-Frequency-RB\"][\"value\"]",
-						"animate": true,
-						"units": " Hz"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Pulse Length",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-EVR-Magtr:Pul0-Width-RB\"][\"value\"]",
-						"animate": true,
-						"units": "&#181;s"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Hydrogen",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:Vac-VVMC-01100:FlwR\"][\"value\"]",
-						"animate": true,
-						"units": "sccm"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Nitrogen",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:Vac-VVMC-01100:FlwR\"][\"value\"]",
-						"animate": true,
-						"units": "sccm"
-					}
-				}
-			]
-		},
-		{
-			"title": "Beam Status",
-			"width": 1,
-			"row": {
-				"1": 19,
-				"2": 11,
-				"3": 21,
-				"5": 21
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"value": "datasources[\"Public Data\"][\"beam\"]",
-						"on_text": "Beam is On",
-						"off_text": "Beam is Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "Beam Current",
-			"width": 1,
-			"row": {
-				"1": 61,
-				"2": 39,
-				"3": 25,
-				"4": 1,
-				"5": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 3,
-				"5": 3
-			},
-			"col_width": 3,
-			"widgets": [
-				{
-					"type": "flot_extended_plugin",
-					"settings": {
-						"plot_type": "line",
-						"legend": true,
-						"height": 4,
-						"value": "[{label: 'Ion Source', data:datasources[\"Public Data\"][\"ISrc-010:PBI-BCM-001:AI4-Compressed\"][\"value\"]}, {label: 'Faraday Cup', data:datasources[\"Public Data\"][\"LEBT-010:PBI-FC-001:AMC31-AOI11-ArrayData\"][\"value\"]}, {label: 'LEBT', data:datasources[\"Public Data\"][\"LEBT-010:PBI-BCM-001:AI5-Compressed\"][\"value\"]}]",
-						"xticks": "",
-						"yticks": "",
-						"points": false,
-						"tooltip": false,
-						"zoom": "xy",
-						"axisLabels": "xaxes: [{axisLabel: 'test'}]"
-					}
-				}
-			]
-		}
-	],
-	"datasources": [
-		{
-			"name": "Public Data",
-			"type": "JSON",
-			"settings": {
-				"url": "http://data.pos.esss.lu.se/getPublicData",
-				"use_thingproxy": false,
-				"refresh": 5,
-				"method": "GET"
-			}
-		}
-	],
-	"columns": 3
-}
diff --git a/Web sites/pos/dashboard.json b/Web sites/pos/dashboard.json
index 72e24903e9735198a1d938dddd1999de8d2088bd..81664e30e7f263c811668753296235efc3fd325e 100644
--- a/Web sites/pos/dashboard.json	
+++ b/Web sites/pos/dashboard.json	
@@ -486,7 +486,7 @@
 			"name": "Public Data",
 			"type": "JSON",
 			"settings": {
-				"url": "http://data.pos.esss.lu.se/getPublicData",
+				"url": "https://data.pos.esss.lu.se/getPublicData",
 				"use_thingproxy": false,
 				"refresh": 1,
 				"method": "GET"
diff --git a/Web sites/pvs/dashboard-good.json b/Web sites/pvs/dashboard-good.json
deleted file mode 100644
index 45a12216adb12563967cd5b9bfc657f8c234a6f8..0000000000000000000000000000000000000000
--- a/Web sites/pvs/dashboard-good.json	
+++ /dev/null
@@ -1,396 +0,0 @@
-{
-	"version": 1,
-	"header_image": "",
-	"allow_edit": false,
-	"plugins": [],
-	"panes": [
-		{
-			"width": 1,
-			"row": {
-				"1": 1,
-				"2": 1,
-				"3": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1
-			},
-			"col_width": 3,
-			"widgets": [
-				{
-					"type": "html",
-					"settings": {
-						"html": "return \"<div style=\\\"position: static; margin-top: -15px;\\\"><img src=\\\"../img/ess-logo.svg\\\" \\\"><div class=\\\"tw-value\\\" style=\\\"font-size: 56px; color:#ffffff !important;position: relative; bottom: 35px; left: 30px;\\\">Public Operations Screen</div></img></div>\"",
-						"height": 2
-					}
-				}
-			]
-		},
-		{
-			"title": "Shift Leader",
-			"width": 1,
-			"row": {
-				"1": 11,
-				"2": 7,
-				"3": 7,
-				"5": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"NSO-LCR:Ops:MSL\"][\"value\"]",
-						"animate": true
-					}
-				}
-			]
-		},
-		{
-			"title": "LCR Messages",
-			"width": 1,
-			"row": {
-				"1": 15,
-				"2": 11,
-				"3": 7,
-				"5": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 3,
-				"5": 3
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "html",
-					"settings": {
-						"html": "return \"<div class=\\\"tw-value\\\" style=\\\"font-size: 16px; width=100%; margin-top:10px; margin-left:10px; margin-right:10px;\\\">\"+ datasources[\"Public Data\"][\"NSO-LCR:Ops:Msg\"][\"value\"] +\"</div>\"",
-						"height": 1
-					}
-				}
-			]
-		},
-		{
-			"title": "Shift ID",
-			"width": 1,
-			"row": {
-				"1": 7,
-				"2": 7,
-				"3": 7,
-				"5": 7
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"5": 1
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"NSO-LCR:Ops:SID\"][\"value\"]",
-						"animate": false
-					}
-				}
-			]
-		},
-		{
-			"title": "Ion Source",
-			"width": 1,
-			"row": {
-				"1": 23,
-				"2": 15,
-				"3": 11,
-				"4": 1,
-				"5": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 1,
-				"5": 1
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Magnetron",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:Setup.B6\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:PulsHLvlS\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:ISS-Magtr:PulsHLvlS\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 1",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 2",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Coil 3",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-CoilPS-03:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Repeller",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:VolR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:PwrC-RepPS-01:VolR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "High Voltage",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:VolR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"ISrc-010:ISS-HVPS:VolR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "LEBT",
-			"width": 1,
-			"row": {
-				"1": 47,
-				"2": 25,
-				"3": 11,
-				"4": 1,
-				"5": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 3,
-				"4": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Solenoid 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Horizontal Steerer 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Vertical Steerer 1",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-01:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Solenoid 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-SolPS-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Horizontal Steerer 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCH-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				},
-				{
-					"type": "indicator",
-					"settings": {
-						"title": "Vertical Steerer 2",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:PwrR\"][\"value\"]",
-						"on_text": "datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:CurR\"][\"value\"]+\" \"+datasources[\"Public Data\"][\"LEBT-010:PwrC-PSCV-02:CurR\"][\"units\"]",
-						"off_text": "Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "Ion Source",
-			"width": 1,
-			"row": {
-				"1": 37,
-				"2": 15,
-				"3": 11,
-				"5": 11
-			},
-			"col": {
-				"1": 1,
-				"2": 2,
-				"3": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Frequency",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:TS-EVG-01:Mxc1-Frequency-RB\"][\"value\"]",
-						"animate": true,
-						"units": " Hz"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Pulse Length",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:ISS-EVR-Magtr:Pul0-Width-RB\"][\"value\"]",
-						"animate": true,
-						"units": "&#181;s"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Hydrogen",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"ISrc-010:Vac-VVMC-01100:FlwR\"][\"value\"]",
-						"animate": true,
-						"units": "sccm"
-					}
-				},
-				{
-					"type": "text_widget",
-					"settings": {
-						"title": "Nitrogen",
-						"size": "regular",
-						"value": "datasources[\"Public Data\"][\"LEBT-010:Vac-VVMC-01100:FlwR\"][\"value\"]",
-						"animate": true,
-						"units": "sccm"
-					}
-				}
-			]
-		},
-		{
-			"title": "Beam Status",
-			"width": 1,
-			"row": {
-				"1": 19,
-				"2": 11,
-				"3": 21,
-				"5": 21
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 2,
-				"5": 2
-			},
-			"col_width": 1,
-			"widgets": [
-				{
-					"type": "indicator",
-					"settings": {
-						"value": "datasources[\"Public Data\"][\"beam\"]",
-						"on_text": "Beam is On",
-						"off_text": "Beam is Off"
-					}
-				}
-			]
-		},
-		{
-			"title": "Beam Current",
-			"width": 1,
-			"row": {
-				"1": 61,
-				"2": 39,
-				"3": 25,
-				"4": 1,
-				"5": 1
-			},
-			"col": {
-				"1": 1,
-				"2": 1,
-				"3": 1,
-				"4": 3,
-				"5": 3
-			},
-			"col_width": 3,
-			"widgets": [
-				{
-					"type": "flot_extended_plugin",
-					"settings": {
-						"plot_type": "line",
-						"legend": true,
-						"height": 4,
-						"value": "[{label: 'Ion Source', data:datasources[\"Public Data\"][\"ISrc-010:PBI-BCM-001:AI4-Compressed\"][\"value\"]}, {label: 'Faraday Cup', data:datasources[\"Public Data\"][\"LEBT-010:PBI-FC-001:AMC31-AOI11-ArrayData\"][\"value\"]}, {label: 'LEBT', data:datasources[\"Public Data\"][\"LEBT-010:PBI-BCM-001:AI5-Compressed\"][\"value\"]}]",
-						"xticks": "",
-						"yticks": "",
-						"points": false,
-						"tooltip": false,
-						"zoom": "xy",
-						"axisLabels": "xaxes: [{axisLabel: 'test'}]"
-					}
-				}
-			]
-		}
-	],
-	"datasources": [
-		{
-			"name": "Public Data",
-			"type": "JSON",
-			"settings": {
-				"url": "http://data.pos.esss.lu.se/getPublicData",
-				"use_thingproxy": false,
-				"refresh": 5,
-				"method": "GET"
-			}
-		}
-	],
-	"columns": 3
-}
diff --git a/Web sites/pvs/dashboard.json b/Web sites/pvs/dashboard.json
index f7be6834eeb80f9e7ae946aae83b9ba1cefd97c3..391c690974da95d1fb8f1789477525636febbe3d 100644
--- a/Web sites/pvs/dashboard.json	
+++ b/Web sites/pvs/dashboard.json	
@@ -53,7 +53,7 @@
 				{
 					"type": "html",
 					"settings": {
-						"html": "<script>\nfunction clickPress(event) {\n    if (event.which == 13) {\n        freeboard.showLoadingIndicator(true);\n    \tvar searchVar = document.getElementById(\"searchBar\").value;\n        $.get(\"http://data.pos.esss.lu.se/search/\"+searchVar).done(function(data) {\n\t\t\tdocument.getElementById('result_div').innerHTML=data[\"pvs\"];\n            freeboard.showLoadingIndicator(false);\n        });\n\t};\n};\n\nfunction searchPV(PVname) {\n\tfreeboard.showLoadingIndicator(true);\n\t$.get(\"http://data.pos.esss.lu.se/getPVHTML/\"+PVname).done(function(data) {\n        if (typeof data[\"link\"] === 'undefined') {\n\t\t\tdocument.getElementById('result_pv').innerHTML=data[\"info\"]+\"<p>\"+data[\"archiver\"];\n        }\n        else {\n            document.getElementById('result_pv').innerHTML=data[\"info\"]+\"<p>\"+data[\"archiver\"]+\"<p>\"+data[\"link\"];\n        };\n        freeboard.showLoadingIndicator(false);\n    });\n};\n</script>\n<center><input id=\"searchBar\" type=\"text\" onkeypress=\"clickPress(event)\" placeholder=\"Search for a PV\"></input></center>\n\n",
+						"html": "<script>\nfunction clickPress(event) {\n    if (event.which == 13) {\n        freeboard.showLoadingIndicator(true);\n    \tvar searchVar = document.getElementById(\"searchBar\").value;\n        $.get(\"https://data.pos.esss.lu.se/search/\"+searchVar).done(function(data) {\n\t\t\tdocument.getElementById('result_div').innerHTML=data[\"pvs\"];\n            freeboard.showLoadingIndicator(false);\n        });\n\t};\n};\n\nfunction searchPV(PVname) {\n\tfreeboard.showLoadingIndicator(true);\n\t$.get(\"https://data.pos.esss.lu.se/getPVHTML/\"+PVname).done(function(data) {\n        if (typeof data[\"link\"] === 'undefined') {\n\t\t\tdocument.getElementById('result_pv').innerHTML=data[\"info\"]+\"<p>\"+data[\"archiver\"];\n        }\n        else {\n            document.getElementById('result_pv').innerHTML=data[\"info\"]+\"<p>\"+data[\"archiver\"]+\"<p>\"+data[\"link\"];\n        };\n        freeboard.showLoadingIndicator(false);\n    });\n};\n</script>\n<center><input id=\"searchBar\" type=\"text\" onkeypress=\"clickPress(event)\" placeholder=\"Search for a PV\"></input></center>\n\n",
 						"height": 1
 					}
 				}