diff --git a/MAC/Navigator/panels/nav_usr/CS1/Station_RSPBoard-CS1.pnl b/MAC/Navigator/panels/nav_usr/CS1/Station_RSPBoard-CS1.pnl
index 6414efe582d4434dc43175171f1c80e9ba80da77..dc58bceebd6857bb81122a2aaed739a73cecd135 100644
--- a/MAC/Navigator/panels/nav_usr/CS1/Station_RSPBoard-CS1.pnl
+++ b/MAC/Navigator/panels/nav_usr/CS1/Station_RSPBoard-CS1.pnl
@@ -1,7 +1,7 @@
 V 10
 1
 LANG:1 7 Subrack
-PANEL,529 258 986 776 N "_3DFace" 2
+PANEL,368 116 986 776 N "_3DFace" 2
 "$datapoint"
 "$referenceDatapoint"
 E"//main()
@@ -1035,60 +1035,52 @@ LANG:1 6 Layer8
 2
 "$APNr""3"
 "$datapoint""$datapoint"
-3 15 "AP0_RCU0"
+3 15 "RCU0"
 "objects\\nav_usr\\STS\\STS_Subrack_RCU.pnl" 62 153 T 161 1 0 1  -52 45  
-4
-"$APNr""0"
+3
 "$RCUNr""0"
 "$datapoint""$datapoint"
 "$referenceDatapoint""$referenceDatapoint"
-3 16 ""
+3 16 "RCU1"
 "objects\\nav_usr\\STS\\STS_Subrack_RCU.pnl" 79 262 T 161 1 0 1  31 -64  
-4
-"$APNr""0"
+3
 "$RCUNr""1"
 "$datapoint""$datapoint"
 "$referenceDatapoint""$referenceDatapoint"
-3 17 "Group16"
+3 17 "RCU2"
 "objects\\nav_usr\\STS\\STS_Subrack_RCU.pnl" 270 210 T 162 1 0 1  -60 -12  
-4
-"$APNr""1"
-"$RCUNr""0"
+3
+"$RCUNr""2"
 "$datapoint""$datapoint"
 "$referenceDatapoint""$referenceDatapoint"
-3 18 "Group18"
+3 18 "RCU3"
 "objects\\nav_usr\\STS\\STS_Subrack_RCU.pnl" 370 210 T 163 1 0 1  -60 -12  
-4
-"$APNr""1"
-"$RCUNr""1"
+3
+"$RCUNr""3"
 "$datapoint""$datapoint"
 "$referenceDatapoint""$referenceDatapoint"
-3 19 "Group20"
+3 19 "RCU4"
 "objects\\nav_usr\\STS\\STS_Subrack_RCU.pnl" 470 210 T 164 1 0 1  -60 -12  
-4
-"$APNr""2"
-"$RCUNr""0"
+3
+"$RCUNr""4"
 "$datapoint""$datapoint"
 "$referenceDatapoint""$referenceDatapoint"
-3 21 "Group24"
+3 21 "RCU5"
 "objects\\nav_usr\\STS\\STS_Subrack_RCU.pnl" 570 210 T 166 1 0 1  -60 -12  
-4
-"$APNr""2"
-"$RCUNr""1"
+3
+"$RCUNr""5"
 "$datapoint""$datapoint"
 "$referenceDatapoint""$referenceDatapoint"
-3 22 "Group26"
+3 22 "RCU6"
 "objects\\nav_usr\\STS\\STS_Subrack_RCU.pnl" 670 210 T 167 1 0 1  -60 -12  
-4
-"$APNr""3"
-"$RCUNr""0"
+3
+"$RCUNr""6"
 "$datapoint""$datapoint"
 "$referenceDatapoint""$referenceDatapoint"
-3 23 "Group28"
+3 23 "RCU7"
 "objects\\nav_usr\\STS\\STS_Subrack_RCU.pnl" 770 210 T 168 1 0 1  -60 -12  
-4
-"$APNr""3"
-"$RCUNr""1"
+3
+"$RCUNr""7"
 "$datapoint""$datapoint"
 "$referenceDatapoint""$referenceDatapoint"
 3 27 "BP"
diff --git a/MAC/Navigator/panels/nav_usr/CS1/Station_Subrack-CS1.pnl b/MAC/Navigator/panels/nav_usr/CS1/Station_Subrack-CS1.pnl
index aae955aa2e3c634cf53b7707b55caf75fb0d2a9a..79df7aa6c4a96db75267c9fd969a3f19831e29ee 100644
--- a/MAC/Navigator/panels/nav_usr/CS1/Station_Subrack-CS1.pnl
+++ b/MAC/Navigator/panels/nav_usr/CS1/Station_Subrack-CS1.pnl
@@ -1,28 +1,49 @@
 V 10
 1
 LANG:1 8 (NoName)
-PANEL,312 137 950 740 N "_3DFace" 1
+PANEL,362 111 950 740 N "_3DFace" 2
 "$datapoint"
+"$referenceDatapoint"
 "main()
 {
-	string dp = $datapoint;
-	string database= \"MainCU\";
-	dyn_string dpAr;
-	dyn_string aS = strsplit(dp,\":\");
-	
-	if (dynlen(aS) > 1) {
-	  database=aS[1];
-	  dpAr= strsplit(aS[2],\"_\");
-	} else {
-	  dpAr= strsplit(aS[1],\"_\");
-  }	
+	// check if this panel is placed on the right datapoint
+	navViewCheckDpType($datapoint,\"SubRack\");
 
+	string aDP = $datapoint;
+	string database=dpSubStr(aDP,DPSUB_SYS);
+  string cNr = \"\";
+  string sNr = \"\";	
+
+	if ( strlen(database) <= 0) {
+		database=\"MainCU\";
+	} else {
+	  strreplace(database,\":\",\"\");
+	}
+	
+	dyn_string dpAr= strsplit(dpSubStr(aDP,DPSUB_DP),\"_\");
+	
+	for (int i = 1; i <= dynlen(dpAr);i++ ) {
+	  if (strpos(dpAr[i],\"Cabinet\") > -1) {
+      cNr = substr(dpAr[i],7,strlen(dpAr[i]));
+    } else if (strpos(dpAr[i],\"Subrack\") > -1) {
+  		sNr = substr(dpAr[i],7,strlen(dpAr[i]));
+  	}
+  }
+  
+  sscanf(cNr,\"%d\",cabinetNr);
+  sscanf(sNr,\"%d\",subrackNr); 
+  
   
   setValue(\"Station_Txt\",\"text\",\"Station: \"+database);
+  setValue(\"Cabinet_Txt\",\"text\",\"Cabinet: \"+cNr);
+  setValue(\"Subrack_Txt\",\"text\",\"Subrack: \"+sNr);
 }" 0
-EE E E 1 0 0 0  -1 -1
+EE E E 1 0 0 0  107 694
 "" 0 1
-EE 2
+E"#uses \"nav_usr/STS/STS-functions.ctl\"
+int cabinetNr = -1;
+int subrackNr = -1;" 0
+ 2
 "CBRef""1"
 "EClose"E
 ""
@@ -30,124 +51,6 @@ DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
 LAYER, 0 
 1
 LANG:1 6 Layer1
-6 0
-"SPUBoard"
-""
-1 107 694 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-1 0 0 0 0 0
-EE E
-0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 107 624 720 694
-2 1
-"Text1"
-""
-1 113 626 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-2 0 0 0 0 0
-EE E
-0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 115 628 146 644
-0 2 0 "s" 0 0 0 192 0 0  115 628
- 1
-1
-LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
-0 ""
-1
-LANG:1 4 SPU 
-6 2
-"ClockBoard"
-""
-1 107 622 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-3 0 0 0 0 0
-EE E
-0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 107 552 720 622
-2 3
-"Text2"
-""
-1 113 556 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-4 0 0 0 0 0
-EE E
-0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 115 558 148 574
-0 2 0 "s" 0 0 0 192 0 0  115 558
- 1
-1
-LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
-0 ""
-1
-LANG:1 5 Clock
-6 4
-"RSPBoard3"
-""
-1 613 550 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-5 0 0 0 0 0
-EE E
-0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 613 110 720 550
-6 5
-"RSPBoard2"
-""
-1 505 550 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-6 0 0 0 0 0
-EE E
-0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 505 110 612 550
-6 6
-"RSPBoard0"
-""
-1 289 550 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-7 0 0 0 0 0
-EE E
-0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 289 110 396 550
-6 7
-"RSPBoard1"
-""
-1 397 550 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-8 0 0 0 0 0
-EE E
-0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 397 110 504 550
 6 8
 "TBB1"
 ""
@@ -214,627 +117,245 @@ LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-
 0 ""
 1
 LANG:1 3 TBB
-2 12
-"Text5"
+6 16
+"Subrack"
 ""
-1 295 116 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 106 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
  E E
-13 0 0 0 0 0
+17 0 0 0 0 0
 EE E
 0
 1
 LANG:1 0 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 297 118 324 134
-0 2 0 "s" 0 0 0 192 0 0  297 118
- 1
-1
-LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
-0 ""
-1
-LANG:1 3 RSP
-2 13
-"Text6"
+E E 0 1 1 0 1 E U  1 E 106 20 287 108
+2 53
+"Subrack_Txt"
 ""
-1 403 116 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 113 78 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
  E E
-14 0 0 0 0 0
+54 0 0 0 0 0
 EE E
 0
 1
 LANG:1 0 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 405 118 432 134
-0 2 0 "s" 0 0 0 192 0 0  405 118
+E E 0 1 1 0 1 E U  0 E 115 80 167 96
+0 2 0 "s" 0 0 0 192 0 0  115 80
  1
 1
-LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
 0 ""
 1
-LANG:1 3 RSP
-2 14
-"Text7"
+LANG:1 7 Subrack
+2 55
+"Cabinet_Txt"
 ""
-1 511 116 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 113 52 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
  E E
-15 0 0 0 0 0
+56 0 0 0 0 0
 EE E
 0
 1
 LANG:1 0 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 513 118 540 134
-0 2 0 "s" 0 0 0 192 0 0  513 118
+E E 0 1 1 0 1 E U  0 E 115 54 164 70
+0 2 0 "s" 0 0 0 192 0 0  115 54
  1
 1
-LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
 0 ""
 1
-LANG:1 3 RSP
-2 15
-"Text8"
+LANG:1 7 Cabinet
+2 57
+"Station_Txt"
 ""
-1 619 116 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+1 113 25 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
  E E
-16 0 0 0 0 0
+58 0 0 0 0 0
 EE E
 0
 1
 LANG:1 0 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 621 118 648 134
-0 2 0 "s" 0 0 0 192 0 0  621 118
+E E 0 1 1 0 1 E U  0 E 115 27 160 43
+0 2 0 "s" 0 0 0 192 0 0  115 27
  1
 1
-LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
 0 ""
 1
-LANG:1 3 RSP
-6 16
-"SubRack"
-""
-1 106 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-17 0 0 0 0 0
-EE E
+LANG:1 7 Station
+1 58 4 "" 0
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 106 20 287 108
-6 17
-"RCU0"
-""
-1 289 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-18 0 0 0 0 0
-EE E
+1 59 4 "" 1
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 289 20 300 108
-6 18
-"Border11"
-""
-1 301 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-19 0 0 0 0 0
-EE E
+1 60 4 "" 4
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 301 20 312 108
-6 19
-"Border12"
-""
-1 313 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-20 0 0 0 0 0
-EE E
+1 61 4 "" 5
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 313 20 324 108
-6 20
-"Border13"
-""
-1 325 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-21 0 0 0 0 0
-EE E
+1 62 4 "" 6
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 325 20 336 108
-6 21
-"Border14"
-""
-1 337 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-22 0 0 0 0 0
-EE E
+1 63 4 "" 10
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 337 20 348 108
-6 22
-"Border15"
-""
-1 349 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-23 0 0 0 0 0
-EE E
+1 64 4 "" 11
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 349 20 360 108
-6 23
-"Border16"
-""
-1 361 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-24 0 0 0 0 0
-EE E
+1 65 4 "" 12
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 361 20 372 108
-6 24
-"Border17"
-""
-1 373 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-25 0 0 0 0 0
-EE E
+1 66 4 "" 17
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 373 20 384 108
-6 25
-"Border18"
-""
-1 385 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-26 0 0 0 0 0
-EE E
+1 67 4 "" 18
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 385 20 396 108
-6 26
-"Border19"
-""
-1 613 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-27 0 0 0 0 0
-EE E
+1 68 4 "" 20
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 613 20 624 108
-6 27
-"Border20"
-""
-1 625 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-28 0 0 0 0 0
-EE E
+1 69 4 "" 21
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 625 20 636 108
-6 28
-"Border21"
-""
-1 637 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-29 0 0 0 0 0
-EE E
+1 70 4 "" 23
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 637 20 648 108
-6 29
-"Border22"
-""
-1 649 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-30 0 0 0 0 0
-EE E
+1 71 4 "" 24
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 649 20 660 108
-6 30
-"Border23"
-""
-1 661 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-31 0 0 0 0 0
-EE E
+1 72 4 "" 25
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 661 20 672 108
-6 31
-"Border24"
-""
-1 673 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-32 0 0 0 0 0
-EE E
+1 73 4 "" 26
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 673 20 684 108
-6 32
-"Border25"
-""
-1 685 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-33 0 0 0 0 0
-EE E
+1 74 4 "" 27
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 685 20 696 108
-6 33
-"Border26"
-""
-1 697 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-34 0 0 0 0 0
-EE E
+1 75 4 "" 28
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 697 20 708 108
-6 34
-"Border27"
-""
-1 709 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-35 0 0 0 0 0
-EE E
+1 79 5 "" 0
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 709 20 720 108
-6 35
-"Border28"
-""
-1 505 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-36 0 0 0 0 0
-EE E
+1 80 5 "" 1
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 505 20 516 108
-6 36
-"Border29"
-""
-1 517 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-37 0 0 0 0 0
-EE E
+1 81 5 "" 4
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 517 20 528 108
-6 37
-"Border30"
-""
-1 529 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-38 0 0 0 0 0
-EE E
+1 82 5 "" 5
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 529 20 540 108
-6 38
-"Border31"
-""
-1 541 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-39 0 0 0 0 0
-EE E
+1 83 5 "" 6
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 541 20 552 108
-6 39
-"Border32"
-""
-1 553 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-40 0 0 0 0 0
-EE E
+1 84 5 "" 10
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 553 20 564 108
-6 40
-"Border33"
-""
-1 565 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-41 0 0 0 0 0
-EE E
+1 85 5 "" 11
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 565 20 576 108
-6 41
-"Border34"
-""
-1 577 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-42 0 0 0 0 0
-EE E
+1 86 5 "" 12
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 577 20 588 108
-6 42
-"Border35"
-""
-1 589 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-43 0 0 0 0 0
-EE E
+1 87 5 "" 13
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 589 20 600 108
-6 43
-"Border36"
-""
-1 601 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-44 0 0 0 0 0
-EE E
+1 88 5 "" 14
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 601 20 612 108
-6 44
-"Border37"
-""
-1 397 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-45 0 0 0 0 0
-EE E
+1 89 5 "" 15
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 397 20 408 108
-6 45
-"Border38"
-""
-1 409 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-46 0 0 0 0 0
-EE E
+1 90 5 "" 17
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 409 20 420 108
-6 46
-"Border39"
-""
-1 421 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-47 0 0 0 0 0
-EE E
+1 91 5 "" 18
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 421 20 432 108
-6 47
-"Border40"
-""
-1 433 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-48 0 0 0 0 0
-EE E
+1 92 5 "" 20
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 433 20 444 108
-6 48
-"Border41"
-""
-1 445 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-49 0 0 0 0 0
-EE E
+1 93 5 "" 21
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 445 20 456 108
-6 49
-"Border42"
-""
-1 457 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-50 0 0 0 0 0
-EE E
+1 94 5 "" 22
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 457 20 468 108
-6 50
-"Border43"
-""
-1 469 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-51 0 0 0 0 0
-EE E
+1 95 5 "" 23
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 469 20 480 108
-6 51
-"Border44"
-""
-1 481 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-52 0 0 0 0 0
-EE E
+1 97 6 "" 0
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 481 20 492 108
-6 52
-"Border45"
-""
-1 493 108 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
- E E
-53 0 0 0 0 0
-EE E
+1 98 6 "" 1
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  1 E 493 20 504 108
-2 53
-"Subrack_Txt"
-""
-1 113 65 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-54 0 0 0 0 0
-EE E
+1 99 6 "" 2
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 115 67 171 83
-0 2 0 "s" 0 0 0 64 0 0  115 67
- 1
-1
-LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
-0 ""
-1
-LANG:1 7 SubRack
-2 55
-"Cabinet_Txt"
-""
-1 113 45 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-56 0 0 0 0 0
-EE E
+1 100 6 "" 3
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 115 47 164 63
-0 2 0 "s" 0 0 0 192 0 0  115 47
- 1
-1
-LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
-0 ""
-1
-LANG:1 7 Cabinet
-2 57
-"Station_Txt"
-""
-1 113 25 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
- E E
-58 0 0 0 0 0
-EE E
+1 101 6 "" 4
+0
+1 102 6 "" 5
+0
+1 103 6 "" 6
+0
+1 104 6 "" 7
+0
+1 105 6 "" 8
+0
+1 106 6 "" 9
+0
+1 107 6 "" 10
+0
+1 108 7 "" 0
+0
+1 109 7 "" 1
+0
+1 110 7 "" 2
+0
+1 111 7 "" 3
+0
+1 112 7 "" 4
+0
+1 113 7 "" 5
+0
+1 114 7 "" 6
+0
+1 115 7 "" 7
+0
+1 116 7 "" 8
+0
+1 117 7 "" 9
+0
+1 118 7 "" 10
+0
+1 119 8 "" 0
+0
+1 120 8 "" 1
+0
+1 121 8 "" 2
+0
+1 122 8 "" 3
+0
+1 123 8 "" 4
+0
+1 124 8 "" 5
+0
+1 125 8 "" 6
+0
+1 126 8 "" 7
+0
+1 127 8 "" 8
+0
+1 128 8 "" 9
+0
+1 129 8 "" 10
+0
+1 130 9 "" 0
+0
+1 131 9 "" 1
+0
+1 132 9 "" 2
+0
+1 133 9 "" 3
+0
+1 134 9 "" 4
+0
+1 135 9 "" 5
+0
+1 136 9 "" 6
+0
+1 137 9 "" 7
+0
+1 138 9 "" 8
+0
+1 139 9 "" 9
+0
+1 140 9 "" 10
+0
+1 76 4 "" 19
+0
+1 77 4 "" 29
+0
+1 78 4 "" 30
+0
+1 96 5 "" 19
 0
-1
-LANG:1 0 
-1
-"dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 115 27 160 43
-0 2 0 "s" 0 0 0 192 0 0  115 27
- 1
-1
-LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
-0 ""
-1
-LANG:1 7 Station
 0
 LAYER, 1 
 1
@@ -864,4 +385,36 @@ LAYER, 7
 1
 LANG:1 6 Layer8
 0
+3 4 "Group4"
+"objects\\nav_usr\\CS1\\Subrack_ClockBoard.pnl" 106 552 T 62 1 0 1  0 180  
+1
+"$datapoint""$datapoint"
+3 5 "Group6"
+"objects\\nav_usr\\CS1\\Subrack_SPUBoard.pnl" 106 624 T 63 1 0 1  1 180  
+1
+"$datapoint""$datapoint"
+3 6 ""
+"objects\\nav_usr\\CS1\\Subrack_RSPBoard.pnl" 347 246 T 64 1 0 1  -57 304  
+3
+"$RSP""0"
+"$datapoint""$datapoint"
+"$referenceDatapoint""$referenceDatapoint"
+3 7 ""
+"objects\\nav_usr\\CS1\\Subrack_RSPBoard.pnl" 509 214 T 65 1 0 1  -112 336  
+3
+"$RSP""1"
+"$datapoint""$datapoint"
+"$referenceDatapoint""$referenceDatapoint"
+3 8 ""
+"objects\\nav_usr\\CS1\\Subrack_RSPBoard.pnl" 595 350 T 66 1 0 1  -91 200  
+3
+"$RSP""2"
+"$datapoint""$datapoint"
+"$referenceDatapoint""$referenceDatapoint"
+3 9 ""
+"objects\\nav_usr\\CS1\\Subrack_RSPBoard.pnl" 666 266 T 67 1 0 1  -55 284  
+3
+"$RSP""3"
+"$datapoint""$datapoint"
+"$referenceDatapoint""$referenceDatapoint"
 0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/nav_usr/CS1/controller-overview.pnl b/MAC/Navigator/panels/nav_usr/CS1/controller-overview.pnl
index c038fc7ba19bf3910c071484a410c002d86401d6..e7e75a2c6089f6f50031f73b1a1d7843e738eda7 100644
--- a/MAC/Navigator/panels/nav_usr/CS1/controller-overview.pnl
+++ b/MAC/Navigator/panels/nav_usr/CS1/controller-overview.pnl
@@ -1,7 +1,7 @@
 V 10
 1
 LANG:1 13 ObsCtrl_State
-PANEL,276 950 950 741 N "_3DFace" 1
+PANEL,231 119 950 741 N "_3DFace" 1
 "$datapoint"
 "main()
 {
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Clockboard.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Clockboard.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..c657a0484aa08d962ddecbeecf18bbdb638c2100
--- /dev/null
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_Clockboard.pnl
@@ -0,0 +1,567 @@
+V 10
+1
+LANG:1 17 SubrackClockBoard
+PANEL,362 111 735 210 N "_3DFace" 1
+"$datapoint"
+"main()
+{
+  baseDP=$datapoint+\".clock\";
+	// load propertysets from datapoints
+	navPMLloadPropertySet(baseDP);
+	
+	// check if the requiered datapoint for this view are enabled and accessible
+	if (dpAccessable(baseDP+\".Vfsp\")) {
+	  dpConnect(\"updateSubrackClock\",baseDP + \".temperature\",
+	                                 baseDP + \".freq\",
+ 	                                 baseDP + \".temperature:_online.._invalid\");
+    dpConnect(\"showVersion\", baseDP +\".version:_online.._value\");
+ 	} else {
+    setValue(\"ClockBoard\", \"backCol\", \"_dpdoesnotexist\");
+    setValue(\"detailButton\", \"backCol\", \"_dpdoesnotexist\");
+    setValue(\"txt_temperature\", \"text\", \"x.x\");
+    setValue(\"txt_freq\", \"text\", \"x.x\");
+  }	
+}
+
+updateSubrackClock(string dp1, float temperature,
+                 string dp2, int freq,
+							   string dp3, bool invalid)
+{
+	string SymbolCol;
+	bool state = FALSE; 
+	getValue(\"detailButton\",\"state\",0,state);
+	
+	if (invalid) 
+	{
+		SymbolCol=\"Lofar_device_invalid\";
+    setValue(\"txt_temperature\", \"text\", \"x.x\");
+    setValue(\"txt_freq\", \"text\", \"x.x\");
+  } else {
+		SymbolCol=\"Lofar_device_active\";	  
+    setValue(\"txt_temperature\", \"text\", temperature);
+    setValue(\"txt_freq\", \"text\", freq);    
+  }
+  setValue(\"ClockBoard\", \"backCol\", SymbolCol);
+  setValue(\"detailButton\", \"backCol\", SymbolCol);
+  if (state) {
+    setValue(\"lock160\",\"backCol\",SymbolCol);
+    setValue(\"lock200\",\"backCol\",SymbolCol);
+  }
+}" 0
+"main()
+{
+  navPMLunloadPropertySet(baseDP);
+}" 0
+E E E 1 0 0 0  50 250
+"" 0 1
+E"string baseDP=\"\";" 0
+ 2
+"CBRef""1"
+"EClose"E
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0 
+1
+LANG:1 6 Layer1
+6 0
+"ClockBoard"
+""
+1 50 140 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+ E E
+1 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 50 70 663 140
+2 1
+"Text1"
+""
+1 56 76 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+2 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 58 78 135 94
+0 2 0 "s" 0 0 0 192 0 0  58 78
+ 1
+1
+LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 11 Clock Board
+2 4
+"label_Vfsp"
+""
+1 107 117 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+5 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 109 119 138 138
+0 2 0 "s" 0 0 0 66 0 0  109 119
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 Vfsp
+6 5
+"rect_Vfsp"
+""
+1 148 135 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+ E E
+6 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 148 115 211 135
+2 6
+"txt_Vfsp"
+""
+1 170 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+7 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 197 117 222 133
+0 2 0 "2.2f" 5 0 0 194 0 0  197 117
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 0.00
+2 10
+"label_Vclock"
+""
+1 233 117 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+11 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 235 119 274 138
+0 2 0 "s" 0 0 0 66 0 0  235 119
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 5 Clock
+6 11
+"rect_Vclock"
+""
+1 284 135 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+ E E
+12 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 284 115 347 135
+2 12
+"txt_Vclock"
+""
+1 306 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+13 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 333 117 358 133
+0 2 0 "2.2f" 5 0 0 194 0 0  333 117
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 0.00
+6 17
+"rect_temperature"
+""
+1 148 96 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+ E E
+18 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 148 76 211 96
+2 18
+"txt_temperature"
+""
+1 167 76 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+19 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 194 78 219 94
+0 2 0 "2.2f" 5 0 0 194 0 0  194 78
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 0.00
+2 20
+"txt_unitVfsp"
+""
+1 200 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+21 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 202 117 211 133
+0 2 0 "s" 0 0 0 192 0 0  202 117
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 1 V
+2 21
+"txt_unitVclock"
+""
+1 336 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+22 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 338 117 347 133
+0 2 0 "s" 0 0 0 192 0 0  338 117
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 1 V
+2 23
+"txt_unitTemperature"
+""
+1 195 76 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+24 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 197 78 211 94
+0 2 0 "s" 0 0 0 192 0 0  197 78
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 2 �C
+2 24
+"txt_version"
+""
+1 617 123 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+24 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 656 125 693 139
+0 2 0 "s" 0 0 0 194 0 0  656 125
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-11,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 8 ver: x.x
+2 25
+"label_freq"
+""
+1 237 78 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+25 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 239 80 274 98
+0 2 0 "s" 0 0 0 66 0 0  239 80
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 5 Freq.
+6 26
+"rect_freq"
+""
+1 284 96 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+ E E
+26 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 284 76 347 96
+2 27
+"txt_freq"
+""
+1 312 76 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+27 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 342 78 370 94
+0 2 0 "4d" 4 0 0 194 0 0  342 78
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 0000
+2 28
+"txt_unitFreq"
+""
+1 355 76 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+28 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 357 78 382 94
+0 2 0 "s" 0 0 0 192 0 0  357 78
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 3 Mhz
+20 19
+"detailButton"
+""
+1 453 76 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+20 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+0
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+451 74 523 103
+1
+T 
+1
+LANG:1 6 Detail
+ 0
+1
+LANG:1 0 
+ E  E  0 0 0 0 0
+1
+E E 
+E"main(int button, bool state)
+{
+  if (button == 0)
+  {
+    setValue(\"label_Vfsp\", \"visible\", state);
+    setValue(\"label_Vclock\", \"visible\", state);
+    setValue(\"lock160\", \"visible\", state);
+    setValue(\"lock200\", \"visible\", state);
+    setValue(\"txt_Vfsp\"  , \"visible\", state);
+    setValue(\"txt_Vclock\"  , \"visible\", state);
+    setValue(\"txt_unitVfsp\"  , \"visible\", state);
+    setValue(\"txt_unitVclock\"  , \"visible\", state);
+
+    setValue(\"rect_Vfsp\"  , \"visible\", state);
+    setValue(\"rect_Vclock\"  , \"visible\", state);
+
+    if (state == TRUE)        // if checkbox is checked, show details and connect textbox to the datapoints
+    {
+      if(!dpAccessable(baseDP + \".Vfsp:_online.._value\") ||
+		     !dpAccessable(baseDP + \".Vclock:_online.._value\") ||
+		     !dpAccessable(baseDP + \".lock160:_online.._value\") ||
+		     !dpAccessable(baseDP + \".lock200:_online.._value\"))
+      {
+        setValue(\"rect_Vfsp\", \"backCol\", \"_dpdoesnotexist\");
+        setValue(\"rect_Vclock\", \"backCol\", \"_dpdoesnotexist\");
+        setValue(\"lock160\", \"backCol\", \"_dpdoesnotexist\");
+        setValue(\"lock200\", \"backCol\", \"_dpdoesnotexist\");
+        setValue(\"txt_Vfsp\", \"visible\", FALSE);
+        setValue(\"txt_Vclock\", \"visible\", FALSE);
+        setValue(\"lock160\", \"visible\", FALSE);
+        setValue(\"lock200\", \"visible\", FALSE);
+         return;
+      }
+      else
+      {
+        string aCol;
+        getValue(\"ClockBoard\",\"backCol\",aCol);
+        setValue(\"rect_Vfsp\", \"backCol\", \"white\");
+        setValue(\"rect_Vclock\", \"backCol\", \"white\");
+        setValue(\"lock160\", \"backCol\", aCol);
+        setValue(\"lock200\", \"backCol\", aCol);
+        navPMLloadPropertySet(baseDP);
+        dpConnect(\"SubrackSPUDetails\", baseDP + \".Vfsp:_online.._value\",
+																		   baseDP + \".Vclock:_online.._value\",
+                                       baseDP + \".lock160:_online.._value\",
+                                       baseDP + \".lock200:_online.._value\",
+                                       baseDP + \".Vfsp:_online.._invalid\");
+      }
+    }
+    else   // if checkbox is NOT checked, disconnect datapoints and unload propertyset
+    {
+      dpDisconnect(\"SubrackSPUDetails\", baseDP + \".Vfsp:_online.._value\",
+      																  baseDP + \".Vclock:_online.._value\",
+      																  baseDP + \".lock160:_online.._value\",
+      																  baseDP + \".lock200:_online.._value\",
+                                        baseDP + \".Vfsp:_online.._invalid\");
+      navPMLunloadPropertySet(baseDP);
+    }
+   }
+}
+
+SubrackSPUDetails(string dp1, float Vfsp,
+                  string dp2, float Vclock,
+                  string dp3, bool  lock160,
+                  string dp4, bool  lock200,
+                  string dp5, bool  invalid)
+{
+    setValue(\"txt_Vfsp\"   , \"text\", Vfsp);
+    setValue(\"txt_Vclock\" , \"text\", Vclock);
+    setValue(\"lock160\"    , \"state\", 0, lock160);
+    setValue(\"lock200\"    , \"state\", 0, lock200);
+}" 0
+20 29
+"lock160"
+""
+1 393 115 E E E 1 E 0 E N "_3DText" E N "_3DFace" E E
+ E E
+29 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+0
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+391 113 475 137
+1
+T 
+1
+LANG:1 7 lock160
+ 0
+1
+LANG:1 0 
+ E  E  0 0 0 0 0
+1
+E E 
+EE20 30
+"lock200"
+""
+1 482 115 E E E 1 E 0 E N "_3DText" E N "_3DFace" E E
+ E E
+30 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+0
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+480 113 564 137
+1
+T 
+1
+LANG:1 7 lock200
+ 0
+1
+LANG:1 0 
+ E  E  0 0 0 0 0
+1
+E E 
+EE0
+LAYER, 1 
+1
+LANG:1 6 Layer2
+0
+LAYER, 2 
+1
+LANG:1 6 Layer3
+0
+LAYER, 3 
+1
+LANG:1 6 Layer4
+0
+LAYER, 4 
+1
+LANG:1 6 Layer5
+0
+LAYER, 5 
+1
+LANG:1 6 Layer6
+0
+LAYER, 6 
+1
+LANG:1 6 Layer7
+0
+LAYER, 7 
+1
+LANG:1 6 Layer8
+0
+0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_RSPBoard.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_RSPBoard.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..dc99411a9e83628a81c350d0fe1a3457429e5ff6
--- /dev/null
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_RSPBoard.pnl
@@ -0,0 +1,705 @@
+V 10
+1
+LANG:1 8 (NoName)
+PANEL,342 95 511 593 N "_3DFace" 3
+"$RSP"
+"$datapoint"
+"$referenceDatapoint"
+"main()
+{
+
+	aDP = $datapoint;
+	string database=dpSubStr(aDP,DPSUB_SYS);
+  string sNr = \"\";	
+  int subrackNr = -1;
+  rspNr = -1;
+  
+	if ( strlen(database) <= 0) {
+		database=\"MainCU\";
+	} else {
+	  strreplace(database,\":\",\"\");
+	}
+	
+	dpAr= strsplit(dpSubStr(aDP,DPSUB_DP),\"_\");
+	
+	for (int i = 1; i <= dynlen(dpAr);i++ ) {
+  	if (strpos(dpAr[i],\"Subrack\") > -1) {
+  		sNr = substr(dpAr[i],7,strlen(dpAr[i]));
+  		break;
+  	}
+  }
+  
+  sscanf(sNr,\"%d\",subrackNr); 
+  sscanf($RSP,\"%d\",rspNr);	
+
+  rspNr=rspNr+(subrackNr*4);	
+  RSPBoard=\"RSPBoard\"+rspNr;
+	
+	setValue(\"RSPBoard_Txt\",\"text\",\"RSP: \"+rspNr);
+	
+	baseDP= aDP+\"_\"+RSPBoard;
+	// load propertysets from datapoints
+	navPMLloadPropertySet(baseDP);
+
+	// check if the requiered datapoint for this view are enabled and accessible
+	if (dpAccessable(baseDP+\".state\")) {
+	  dpConnect(\"updateRSPBoard\",baseDP + \".state\",
+ 	                             baseDP + \".state:_online.._invalid\");
+ 	  dpConnect(\"showVersion\", baseDP + \".version:_online.._value\");
+  } else {
+    setValue(\"RSPBoard\", \"backCol\", \"_dpdoesnotexist\");
+    setValue(\"detailButton\", \"backCol\", \"_dpdoesnotexist\");
+  }
+  
+  for (int j=0; j< 8; j++) {
+    connectRCU(j,rspNr);
+  }
+}
+
+updateRSPBoard(string dp1, string state,
+ 					     string dp2, bool invalid)
+{
+	string SymbolCol;
+	bool state = FALSE; 
+	
+	if (invalid) 
+	{
+		SymbolCol=\"Lofar_device_invalid\";
+  } else {
+		SymbolCol=\"Lofar_device_active\";	  
+  }
+  setValue(\"RSPBoard\", \"backCol\", SymbolCol);
+  setValue(\"detailButton\", \"backCol\", SymbolCol);
+}
+
+connectRCU(int cnt,int rspNr) {
+  int rcuNr= cnt + (rspNr*8);
+  string RCUstr=\"RCU\"+cnt;
+
+  string rcuDP=baseDP+\"_\"+\"RCU\"+rcuNr;
+	navPMLloadPropertySet(rcuDP);
+	DebugTN( \"Loading rcu: \", rcuDP);
+	// check if the required datapoint for this view are enabled and accessible
+	if (dpAccessable(rcuDP+\".state\")) {
+	  dpConnect(\"updateRCU\",rcuDP + \".state\",
+ 	                        rcuDP + \".state:_online.._invalid\");
+ 	 
+  } else {
+    setValue(RCUstr, \"backCol\", \"_dpdoesnotexist\");
+  }	
+}
+
+updateRCU(string dp1, string state,
+  		    string dp2, bool invalid)
+{
+	string SymbolCol;
+	bool state = FALSE;
+	string rsp=\"\";
+	string rcu=\"\";
+	int rcuNr=-1;
+	int rspNr=-1;
+	
+  dyn_string dpAr= strsplit(dpSubStr(dp1,DPSUB_DP),\"_\");
+	
+	for (int i = 1; i <= dynlen(dpAr);i++ ) {
+  	if (strpos(dpAr[i],\"RSPBoard\") > -1) {
+  		rsp = substr(dpAr[i],8,strlen(dpAr[i]));
+  	} else if (strpos(dpAr[i],\"RCU\") > -1) {
+  		rcu = substr(dpAr[i],3,strlen(dpAr[i]));
+  	}
+
+  }
+  
+  sscanf(rsp,\"%d\",rspNr); 
+	sscanf(rcu,\"%d\",rcuNr); 
+
+  int anRCUNr= rcuNr-(rspNr*8);
+  string anRCU=\"RCU\"+anRCUNr;
+  string toolTip=\"RCU\"+rcu;
+  
+  if (invalid) 
+	{
+		SymbolCol=\"Lofar_device_invalid\";
+  } else {
+		SymbolCol=\"Lofar_device_active\";	  
+  }
+  setValue(anRCU, \"backCol\", SymbolCol);
+  setValue(anRCU,\"toolTipText\",toolTip);
+}
+" 0
+"main()
+{
+  navPMLunloadPropertySet(baseDP);
+  
+  for (int j=0; j< 8; j++) {
+    unloadRCU(j,rspNr);
+  }
+}
+
+unloadRCU(int cnt,int rcuNr) {
+  int rcuNr= cnt + (rspNr*8);
+  string rcuDP=baseDP+\"_\"+\"RCU\"+rcuNr;
+  DebugTN( \"Unloading rcu: \", rcuDP);
+	navPMLunloadPropertySet(rcuDP);
+}" 0
+E E E 1 0 0 0  20 560
+"" 0 1
+E"string baseDP = \"\";
+string RSPBoard = \"\";
+string aDP=\"\";
+dyn_string dpAr;
+int rspNr=-1;" 0
+ 2
+"CBRef""1"
+"EClose"E
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0 
+1
+LANG:1 6 Layer1
+6 0
+"RSPBoard"
+""
+1 20 560 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+ E E
+1 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E "main()
+{
+		aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard, \"Station_RSPBoard-CS1.pnl\");
+}" 0
+ 0 1 1 0 1 E U  1 E 20 120 127 560
+2 10
+"RSPBoard_Txt"
+""
+1 26 126 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+11 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 28 128 55 144
+0 2 0 "s" 0 0 0 192 0 0  28 128
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 3 RSP
+2 11
+"txt_version"
+""
+1 81 537 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+12 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 120 539 157 553
+0 2 0 "s" 0 0 0 194 0 0  120 539
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-11,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 8 ver: x.x
+2 13
+"label_voltage25"
+""
+1 40 258 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+14 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 106 260 170 275
+0 2 0 "s" 0 0 0 194 0 0  106 260
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 12 Voltage 2.5:
+2 14
+"label_voltage12"
+""
+1 40 200 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+15 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 106 202 170 217
+0 2 0 "s" 0 0 0 194 0 0  106 202
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 12 Voltage 1.2:
+6 15
+"rect_voltage12"
+""
+1 42 238 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+ E E
+16 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 42 218 105 238
+2 16
+"txt_voltage12"
+""
+1 63 219 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+17 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 90 221 115 237
+0 2 0 "1.2f" 4 0 0 194 0 0  90 221
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 0.00
+6 17
+"rect_voltage25"
+""
+1 41 296 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+ E E
+18 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 41 276 104 296
+2 18
+"txt_voltage25"
+""
+1 62 276 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+19 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 89 278 114 294
+0 2 0 "1.2f" 4 0 0 194 0 0  89 278
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 0.00
+2 19
+"txt_unitVoltage12"
+""
+1 91 219 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+20 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 93 221 102 237
+0 2 0 "s" 0 0 0 192 0 0  93 221
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 1 V
+2 20
+"txt_unitVoltage25"
+""
+1 90 276 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+21 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 92 278 101 294
+0 2 0 "s" 0 0 0 192 0 0  92 278
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 1 V
+2 21
+"label_voltage33"
+""
+1 40 315 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+22 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 106 317 170 332
+0 2 0 "s" 0 0 0 194 0 0  106 317
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 12 Voltage 3.3:
+6 22
+"rect_voltage33"
+""
+1 41 354 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+ E E
+23 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 41 334 104 354
+2 23
+"txt_voltage33"
+""
+1 62 334 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+24 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 89 336 114 352
+0 2 0 "1.2f" 4 0 0 194 0 0  89 336
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 0.00
+2 24
+"txt_unitVoltage33"
+""
+1 90 333 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+25 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 92 335 101 351
+0 2 0 "s" 0 0 0 192 0 0  92 335
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 1 V
+6 33
+"RCU0"
+""
+1 22 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+33 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E "main()
+{
+    string rcu=\"\";
+    getValue(\"RCU0\",\"toolTipText\",rcu);
+		aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
+}" 0
+ 0 1 1 0 1 E U  1 E 22 30 34 118
+6 34
+"RCU1"
+""
+1 35 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+34 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E "main()
+{
+    string rcu=\"\";
+    getValue(\"RCU1\",\"toolTipText\",rcu);
+		aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
+}" 0
+ 0 1 1 0 1 E U  1 E 35 30 47 118
+6 35
+"RCU7"
+""
+1 113 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+35 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E "main()
+{
+    string rcu=\"\";
+    getValue(\"RCU7\",\"toolTipText\",rcu);
+		aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
+}" 0
+ 0 1 1 0 1 E U  1 E 113 30 125 118
+6 36
+"RCU2"
+""
+1 48 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+36 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E "main()
+{
+    string rcu=\"\";
+    getValue(\"RCU2\",\"toolTipText\",rcu);
+		aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
+}" 0
+ 0 1 1 0 1 E U  1 E 48 30 60 118
+6 37
+"RCU3"
+""
+1 61 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+37 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E "main()
+{
+    string rcu=\"\";
+    getValue(\"RCU3\",\"toolTipText\",rcu);
+		aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
+}" 0
+ 0 1 1 0 1 E U  1 E 61 30 73 118
+6 38
+"RCU4"
+""
+1 74 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+38 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E "main()
+{
+    string rcu=\"\";
+    getValue(\"RCU4\",\"toolTipText\",rcu);
+		aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
+}" 0
+ 0 1 1 0 1 E U  1 E 74 30 86 118
+6 39
+"RCU5"
+""
+1 87 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+39 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E "main()
+{
+    string rcu=\"\";
+    getValue(\"RCU5\",\"toolTipText\",rcu);
+		aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
+}" 0
+ 0 1 1 0 1 E U  1 E 87 30 99 118
+6 40
+"RCU6"
+""
+1 100 118 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+40 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E "main()
+{
+    string rcu=\"\";
+    getValue(\"RCU6\",\"toolTipText\",rcu);
+		aplViewNavigateTo($datapoint, $referenceDatapoint, \"_\"+RSPBoard+\"_\"+ rcu, \"Station_Subrack_RCU.pnl\");
+}" 0
+ 0 1 1 0 1 E U  1 E 100 30 112 118
+20 12
+"detailButton"
+""
+1 26 153 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+13 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+0
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+24 151 88 175
+1
+T 
+1
+LANG:1 7 details
+ 0
+1
+LANG:1 0 
+ E  E  0 0 0 0 0
+1
+E E 
+E"main(int button, bool state)
+{
+  if (button == 0)
+  {
+    setValue(\"label_voltage12\", \"visible\", state);
+    setValue(\"label_voltage25\", \"visible\", state);
+    setValue(\"label_voltage33\", \"visible\", state);
+    setValue(\"txt_voltage12\"  , \"visible\", state);
+    setValue(\"txt_voltage25\"  , \"visible\", state);
+    setValue(\"txt_voltage33\"  , \"visible\", state);
+    setValue(\"txt_unitVoltage12\"  , \"visible\", state);
+    setValue(\"txt_unitVoltage25\"  , \"visible\", state);
+    setValue(\"txt_unitVoltage33\"  , \"visible\", state);
+
+    setValue(\"rect_voltage12\"  , \"visible\", state);
+    setValue(\"rect_voltage25\"  , \"visible\", state);
+    setValue(\"rect_voltage33\"  , \"visible\", state);
+    if (state == TRUE)        // if checkbox is checked, show details and connect textbox to the datapoints
+    {
+      if(!dpAccessable(baseDP + \".voltage12:_online.._value\") ||
+		     !dpAccessable(baseDP + \".voltage12:_online.._value\") ||
+		     !dpAccessable(baseDP + \".voltage25:_online.._value\"))
+      {
+        setValue(\"rect_voltage12\", \"backCol\", \"_dpdoesnotexist\");
+        setValue(\"rect_voltage25\", \"backCol\", \"_dpdoesnotexist\");
+        setValue(\"rect_voltage33\", \"backCol\", \"_dpdoesnotexist\");
+        setValue(\"txt_voltage12\", \"visible\", FALSE);
+        setValue(\"txt_voltage25\", \"visible\", FALSE);
+        setValue(\"txt_voltage33\", \"visible\", FALSE);
+        return;
+      }
+      else
+      {
+        setValue(\"rect_voltage12\", \"backCol\", \"white\");
+        setValue(\"rect_voltage25\", \"backCol\", \"white\");
+        setValue(\"rect_voltage33\", \"backCol\", \"white\");
+        dpConnect(\"BoardETHDetails\", baseDP + \".voltage12:_online.._value\",
+																		 baseDP + \".voltage25:_online.._value\",
+                                     baseDP + \".voltage33:_online.._value\",
+                                     baseDP + \".voltage12:_online.._invalid\");
+      }
+    }
+    else   // if checkbox is NOT checked, show details and connect textbox to the datapoints
+    {
+      dpDisconnect(\"BoardETHDetails\", baseDP + \".voltage12:_online.._value\",
+      																baseDP + \".voltage25:_online.._value\",
+      																baseDP + \".voltage33:_online.._value\",
+                                      baseDP + \".voltage12:_online.._invalid\");
+      }
+   }
+}
+
+
+
+BoardETHDetails(string dp1, float voltage12,
+                string dp2, float voltage25,
+                string dp3, float voltage33,
+                string dp4, bool invalid)
+{
+    setValue(\"txt_voltage12\"   , \"text\", voltage12);
+    setValue(\"txt_voltage25\"   , \"text\", voltage25);
+    setValue(\"txt_voltage33\"   , \"text\", voltage33);
+}" 0
+0
+LAYER, 1 
+1
+LANG:1 6 Layer2
+0
+LAYER, 2 
+1
+LANG:1 6 Layer3
+0
+LAYER, 3 
+1
+LANG:1 6 Layer4
+0
+LAYER, 4 
+1
+LANG:1 6 Layer5
+0
+LAYER, 5 
+1
+LANG:1 6 Layer6
+0
+LAYER, 6 
+1
+LANG:1 6 Layer7
+0
+LAYER, 7 
+1
+LANG:1 6 Layer8
+0
+0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_SPUBoard.pnl b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_SPUBoard.pnl
new file mode 100644
index 0000000000000000000000000000000000000000..276b8929dc29e525b5bc05144848259b6957ea4e
--- /dev/null
+++ b/MAC/Navigator/panels/objects/nav_usr/CS1/Subrack_SPUBoard.pnl
@@ -0,0 +1,479 @@
+V 10
+1
+LANG:1 15 SubRackSPUBoard
+PANEL,362 111 745 269 N "_3DFace" 1
+"$datapoint"
+"main()
+{
+  baseDP=$datapoint+\".SPU\";
+	// load propertysets from datapoints
+	navPMLloadPropertySet(baseDP);
+	
+	// check if the requiered datapoint for this view are enabled and accessible
+	if (dpAccessable(baseDP+\".temperature\")) {
+	  dpConnect(\"updateSubrackSPU\",baseDP + \".temperature\",
+ 	                               baseDP + \".temperature:_online.._invalid\");
+ 	} else {
+    setValue(\"SPUBoard\", \"backCol\", \"_dpdoesnotexist\");
+    setValue(\"detailButton\", \"backCol\", \"_dpdoesnotexist\");
+    setValue(\"txt_temperature\", \"text\", \"x.x\");
+  }	
+}
+
+
+
+
+updateSubrackSPU(string dp1, float temperature, 
+							   string dp3, bool invalid)
+{
+	string SymbolCol;
+	if (invalid) 
+	{
+		SymbolCol=\"Lofar_device_invalid\";
+    setValue(\"txt_temperature\", \"text\", \"x.x\");
+  } else {
+		SymbolCol=\"Lofar_device_active\";	  
+    setValue(\"txt_temperature\",\"text\",temperature);
+  }
+  setValue(\"SPUBoard\", \"backCol\", SymbolCol);
+  setValue(\"detailButton\", \"backCol\", SymbolCol);
+}" 0
+"main()
+{
+  navPMLunloadPropertySet(baseDP);
+}" 0
+E E E 1 0 0 0  50 250
+"" 0 1
+E"string baseDP=\"\";" 0
+ 2
+"CBRef""1"
+"EClose"E
+""
+DISPLAY_LAYER, 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0
+LAYER, 0 
+1
+LANG:1 6 Layer1
+6 0
+"SPUBoard"
+""
+1 50 140 E E E 1 E 1 E N "_WindowText" E N "_3DFace" E E
+ E E
+1 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 50 70 663 140
+2 1
+"Text1"
+""
+1 56 76 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+2 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 58 78 127 94
+0 2 0 "s" 0 0 0 192 0 0  58 78
+ 1
+1
+LANG:1 105 -microsoft windows-Arial-bold-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,700,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 9 SPU Board
+2 4
+"label_Vhba"
+""
+1 63 117 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+5 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 65 119 138 138
+0 2 0 "s" 0 0 0 66 0 0  65 119
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 11 Voltage HBA
+6 5
+"rect_Vhba"
+""
+1 148 135 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+ E E
+6 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 148 115 211 135
+2 6
+"txt_Vhba"
+""
+1 170 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+7 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 197 117 222 133
+0 2 0 "2.2f" 5 0 0 194 0 0  197 117
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 0.00
+2 10
+"label_Vlba"
+""
+1 255 117 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+11 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 257 119 324 133
+0 2 0 "s" 0 0 0 66 0 0  257 119
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 11 Voltage LBA
+6 11
+"rect_Vlba"
+""
+1 334 135 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+ E E
+12 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 334 115 397 135
+2 12
+"txt_Vlba"
+""
+1 356 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+13 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 383 117 408 133
+0 2 0 "2.2f" 5 0 0 194 0 0  383 117
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 0.00
+2 13
+"label_Vdig"
+""
+1 447 117 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+14 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 449 119 516 133
+0 2 0 "s" 0 0 0 66 0 0  449 119
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-110-100-100-*-*-iso8859-1|-12,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 11 Voltage DIG
+6 14
+"rect_Vdig"
+""
+1 526 135 E E E 1 E 0 E N "_WindowText" E N {255,255,255} E E
+ E E
+15 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 526 115 589 135
+2 15
+"txt_Vdig"
+""
+1 548 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+16 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 575 117 600 133
+0 2 0 "2.2f" 5 0 0 194 0 0  575 117
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 0.00
+6 17
+"rect_temperature"
+""
+1 148 96 E E E 1 E 1 E N "_WindowText" E N {255,255,255} E E
+ E E
+18 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  1 E 148 76 211 96
+2 18
+"txt_temperature"
+""
+1 163 76 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+19 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 190 78 215 94
+0 2 0 "2.2f" 5 0 0 194 0 0  190 78
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 4 0.00
+2 20
+"txt_unitVhba"
+""
+1 200 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+21 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 202 117 211 133
+0 2 0 "s" 0 0 0 192 0 0  202 117
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 1 V
+2 21
+"txt_unitVlba"
+""
+1 386 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+22 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 388 117 397 133
+0 2 0 "s" 0 0 0 192 0 0  388 117
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 1 V
+2 22
+"txt_unitVdig"
+""
+1 578 115 E E E 1 E 0 E N "_WindowText" E N "_Transparent" E E
+ E E
+23 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 580 117 589 133
+0 2 0 "s" 0 0 0 192 0 0  580 117
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 1 V
+2 23
+"txt_unitTemperature"
+""
+1 194 76 E E E 1 E 1 E N "_WindowText" E N "_Transparent" E E
+ E E
+24 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+1
+"dashclr"N "_Transparent"
+E E 0 1 1 0 1 E U  0 E 196 78 210 94
+0 2 0 "s" 0 0 0 192 0 0  196 78
+ 1
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+1
+LANG:1 2 �C
+20 19
+"detailButton"
+""
+1 453 76 E E E 1 E 1 E N "_3DText" E N "_3DFace" E E
+ E E
+20 0 0 0 0 0
+EE E
+0
+1
+LANG:1 0 
+0
+1
+LANG:1 107 -microsoft windows-Arial-normal-r-normal-*-*-120-100-100-*-*-iso8859-1|-13,0,0,0,400,0,0,0,0,3,2,1,34,Arial
+0 ""
+451 74 522 95
+1
+T 
+1
+LANG:1 6 Detail
+ 0
+1
+LANG:1 0 
+ E  E  0 0 0 0 0
+1
+E E 
+E"main(int button, bool state)
+{
+  if (button == 0)
+  {
+    setValue(\"label_Vhba\", \"visible\", state);
+    setValue(\"label_Vlba\", \"visible\", state);
+    setValue(\"label_Vdig\", \"visible\", state);
+    setValue(\"txt_Vhba\"  , \"visible\", state);
+    setValue(\"txt_Vlba\"  , \"visible\", state);
+    setValue(\"txt_Vdig\"  , \"visible\", state);
+    setValue(\"txt_unitVhba\"  , \"visible\", state);
+    setValue(\"txt_unitVlba\"  , \"visible\", state);
+    setValue(\"txt_unitVdig\"  , \"visible\", state);
+
+    setValue(\"rect_Vhba\"  , \"visible\", state);
+    setValue(\"rect_Vlba\"  , \"visible\", state);
+    setValue(\"rect_Vdig\"  , \"visible\", state);
+
+    if (state == TRUE)        // if checkbox is checked, show details and connect textbox to the datapoints
+    {
+      if(!dpAccessable(baseDP + \".Vhba:_online.._value\") ||
+		     !dpAccessable(baseDP + \".Vlba:_online.._value\") ||
+		     !dpAccessable(baseDP + \".Vdig:_online.._value\"))
+      {
+        setValue(\"rect_Vhba\", \"backCol\", \"_dpdoesnotexist\");
+        setValue(\"rect_Vlba\", \"backCol\", \"_dpdoesnotexist\");
+        setValue(\"rect_Vdig\", \"backCol\", \"_dpdoesnotexist\");
+        setValue(\"txt_Vhba\", \"visible\", FALSE);
+        setValue(\"txt_Vlba\", \"visible\", FALSE);
+        setValue(\"txt_Vdig\", \"visible\", FALSE);
+         return;
+      }
+      else
+      {
+        setValue(\"rect_Vhba\", \"backCol\", \"white\");
+        setValue(\"rect_Vlba\", \"backCol\", \"white\");
+        setValue(\"rect_Vdig\", \"backCol\", \"white\");
+        navPMLloadPropertySet(baseDP);
+        dpConnect(\"SubrackSPUDetails\", baseDP + \".Vhba:_online.._value\",
+																		   baseDP + \".Vlba:_online.._value\",
+                                       baseDP + \".Vdig:_online.._value\",
+                                       baseDP + \".Vhba:_online.._invalid\");
+      }
+    }
+    else   // if checkbox is NOT checked, disconnect datapoints and unload propertyset
+    {
+      dpDisconnect(\"SubrackSPUDetails\", baseDP + \".Vhba:_online.._value\",
+      																  baseDP + \".Vlba:_online.._value\",
+      																  baseDP + \".Vdig:_online.._value\",
+                                        baseDP + \".Vhba:_online.._invalid\");
+      navPMLunloadPropertySet(baseDP);
+    }
+   }
+}
+
+SubrackSPUDetails(string dp1, float Vhba,
+                  string dp2, float Vlba,
+                  string dp3, float Vdig,
+                  string dp5, bool invalid)
+{
+    setValue(\"txt_Vhba\"        , \"text\", Vhba);
+    setValue(\"txt_Vlba\"        , \"text\", Vlba);
+    setValue(\"txt_Vdig\"        , \"text\", Vdig);
+}" 0
+0
+LAYER, 1 
+1
+LANG:1 6 Layer2
+0
+LAYER, 2 
+1
+LANG:1 6 Layer3
+0
+LAYER, 3 
+1
+LANG:1 6 Layer4
+0
+LAYER, 4 
+1
+LANG:1 6 Layer5
+0
+LAYER, 5 
+1
+LANG:1 6 Layer6
+0
+LAYER, 6 
+1
+LANG:1 6 Layer7
+0
+LAYER, 7 
+1
+LANG:1 6 Layer8
+0
+0
\ No newline at end of file
diff --git a/MAC/Navigator/panels/objects/nav_usr/STS/STS_RCU_Component.pnl b/MAC/Navigator/panels/objects/nav_usr/STS/STS_RCU_Component.pnl
index 38f917b9c9fae42f5a7ea3ee3876b24348888e1b..46a99e156bd4d44cc6cec4bb180d680ac646c874 100644
--- a/MAC/Navigator/panels/objects/nav_usr/STS/STS_RCU_Component.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/STS/STS_RCU_Component.pnl
@@ -1,12 +1,13 @@
 V 10
 1
 LANG:1 8 (NoName)
-PANEL,419 196 308 296 N "_3DFace" 3
+PANEL,419 341 810 296 N "_3DFace" 3
 "$Caption"
 "$Component"
 "$datapoint"
 "main()
 {
+  LOG_TRACE(\"DP: \" + $datapoint + \"  Component: \"+$Component);
   if (dpAccessable($datapoint + \".\" + $Component))
 	{
 	  setValue(\"txt_component\", \"text\", $Caption);
@@ -15,7 +16,7 @@ PANEL,419 196 308 296 N "_3DFace" 3
   }
   else
   {
-    setValue(\"rect\", \"backCol\", \"_dpdoesnotexist\");
+    setValue(\"STS_RCU\", \"backCol\", \"_dpdoesnotexist\");
   }
 }
 
@@ -23,25 +24,28 @@ PANEL,419 196 308 296 N "_3DFace" 3
 ControlComponent(string dp1, bool Status,
                  string dp2, bool invalid)
 {
+
+	string SymbolCol;  
   if(!invalid)
   {
     CheckButton1.enabled = TRUE;
     if (Status==TRUE)
     {
-      setValue(\"rect\", \"backCol\", \"Lofar_device_active\");
+      SymbolCol=\"Lofar_device_active\";
       CheckButton1.state(0)=TRUE;
     }
     else 
     {
-      setValue(\"rect\", \"backCol\", \"grey\");
+      SymbolCol=\"grey\";
       CheckButton1.state(0)=FALSE;
     }
   }
   else
   {
     CheckButton1.enabled = FALSE;
-    setValue(\"rect\", \"backCol\", \"_dpdoesnotexist\");
+    SymbolCol=\"Lofar_device_invalid\";
   }
+  setValue(\"STS_RCU\", \"backCol\", SymbolCol);
 }" 0
 EE E E 1 -1 -1 0  10 41
 "" 0 1
@@ -54,7 +58,7 @@ LAYER, 0
 1
 LANG:1 6 Layer1
 6 0
-"rect"
+"STS_RCU"
 ""
 1 10 41 E E E 1 E 1 E N "_WindowText" E N "grau" E E
  E E
@@ -65,46 +69,7 @@ EE E
 LANG:1 0 
 1
 "dashclr"N "_Transparent"
-"main()
-{
-  if (dpAccessable($datapoint + \".\" + $Component))
-	{
-	  setValue(\"txt_component\", \"text\", $Caption);
-	  dpConnect(\"ControlComponent\", $datapoint + \".\" + $Component + \":_online.._value\",
-	                                //$datapoint + \".\" + $Component + \":_original.._invalid\");
-	                                $datapoint + \".\" + $Component + \":_online.._invalid\");
-  }
-  else
-  {
-    setValue(\"rect\", \"backCol\", \"_dpdoesnotexist\");
-  }
-}
-
-
-ControlComponent(string dp1, bool Status,
-                 string dp2, bool invalid)
-{
-  if(!invalid)
-  {
-    CheckButton1.enabled = TRUE;
-    if (Status==TRUE)
-    {
-      setValue(\"rect\", \"backCol\", \"Lofar_device_active\");
-      CheckButton1.state(0)=TRUE;
-    }
-    else 
-    {
-      setValue(\"rect\", \"backCol\", \"grey\");
-      CheckButton1.state(0)=FALSE;
-    }
-  }
-  else
-  {
-    CheckButton1.enabled = FALSE;
-    setValue(\"rect\", \"backCol\", \"_dpdoesnotexist\");
-  }
-}" 0
- E 0 1 1 0 1 E U  1 E 10 11 110 41
+E E 0 1 1 0 1 E U  1 E 10 11 110 41
 2 2
 "txt_component"
 ""
diff --git a/MAC/Navigator/panels/objects/nav_usr/STS/STS_Subrack_RCU.pnl b/MAC/Navigator/panels/objects/nav_usr/STS/STS_Subrack_RCU.pnl
index 533fc5dc52eddc635e04fead3ff9599517dc9ce0..1f99602422f1c47f41d4b59e1288d773fd0a0ace 100644
--- a/MAC/Navigator/panels/objects/nav_usr/STS/STS_Subrack_RCU.pnl
+++ b/MAC/Navigator/panels/objects/nav_usr/STS/STS_Subrack_RCU.pnl
@@ -1,20 +1,24 @@
 V 10
 1
 LANG:1 11 Subrack_RCU
-PANEL,280 106 139 149 N "_3DFace" 4
-"$APNr"
+PANEL,382 115 139 149 N "_3DFace" 3
 "$RCUNr"
 "$datapoint"
 "$referenceDatapoint"
 "main()
 {
   //Function: Set background color of RCU
-  int ap  = 0;
-  int rcu = 0;
-  sscanf($APNr,\"%d\",ap);
+  
+  int rsp=0;
+  int rcu=0;
+  string aDP=dpSubStr($datapoint,DPSUB_DP);
+  string rspboard = substr(aDP,strpos(aDP,\"RSPBoard\"),strlen(aDP));
+  string rspnr = substr(rspboard,8,strlen(rspboard));
+  sscanf(rspnr,\"%d\",rsp);
   sscanf($RCUNr,\"%d\",rcu);
-  setValue(\"text_RCUNr\", \"text\", \"RCU\" + (ap*2+rcu) );
-  string dpRCU = $datapoint + \".AP\"+ $APNr +\".RCU\"+ $RCUNr;
+  RCUNr= (rsp*8)+rcu;
+  setValue(\"text_RCUNr\", \"text\", \"RCU\" + RCUNr );
+  string dpRCU = $datapoint + \"_RCU\"+ RCUNr;
   backGround.toolTipText       = dpRCU;
   icon_maintenance.toolTipText = dpRCU;
   navPMLloadPropertySet(dpRCU);
@@ -34,12 +38,13 @@ PANEL,280 106 139 149 N "_3DFace" 4
 " 0
 "main()
 {
-  navPMLunloadPropertySet($datapoint + \".AP\"+ $APNr +\".RCU\"+ $RCUNr);
+  navPMLunloadPropertySet($datapoint +\"_RCU\"+ RCUNr);
 
 }" 0
 E E E 1 -1 -1 0  20 140
 "" 0 1
-EE 2
+E"int RCUNr = 0;" 0
+ 2
 "CBRef""1"
 "EClose"E
 ""
@@ -59,7 +64,7 @@ main(int iType)
   dyn_int      diType = makeDynInt();
   dyn_string   dsDps;
 
-  dsDps[1] = $datapoint+\"_Board1_AP\"+$APNr+\"_RCU\"+$RCUNr+\"_status.\" + \":_alert_hdl.._ack\";
+  dsDps[1] = $datapoint+\"_RCU\"+\"RCUNr\"+\"_status.\" + \":_alert_hdl.._ack\";
 
   if ( isFunctionDefined(\"isAckable\") )
   {
@@ -78,7 +83,7 @@ main(int iType)
 }
 // SimpleCtrlScript {EP_confirm}
 // dpCount {1}
-// dp1 {$datapoint + \"_Board1_AP\"+ $APNr +\"_RCU\"+ $RCUNr +\"_status.\"}
+// dp1 {$datapoint + \"_RCU\"+ RCUNr +\"_status.\"}
 // SimpleCtrlScriptEnd {EP_confirm}
 " 0
 
@@ -97,8 +102,8 @@ LANG:1 0
 "dashclr"N "_Transparent"
 E "main()
 {
-  DebugTN(\"Navigate to: Dp: \" + $datapoint + \" RefDp: \" + $referenceDatapoint + \" Point: \" + \".AP\"+ $APNr +\".RCU\"+ $RCUNr);
-  aplViewNavigateTo($datapoint, $referenceDatapoint, \".AP\"+ $APNr +\".RCU\"+ $RCUNr, \"Station_Subrack_RCU.pnl\");
+  DebugTN(\"Navigate to: Dp: \" + $datapoint + \" RefDp: \" + $referenceDatapoint + \" Point: \" + \"_RCU\"+ RCUNr);
+  aplViewNavigateTo($datapoint, $referenceDatapoint, \"_RCU\"+ RCUNr, \"Station_Subrack_RCU.pnl\");
 }" 0
  0 1 1 0 1 E U  1 E 40 40 100 110
 2 5
@@ -113,7 +118,11 @@ EE E
 LANG:1 0 
 1
 "dashclr"N "_Transparent"
-E E 0 1 1 0 1 E U  0 E 49 42 92 58
+"main()
+{
+
+}" 0
+ E 0 1 1 0 1 E U  0 E 49 42 92 58
 0 2 0 "s" 0 0 0 65 0 0  49 42
  1
 1