diff --git a/HEROES SAS GSE/AppController.m b/HEROES SAS GSE/AppController.m
index 2bd4f95..13db60f 100644
--- a/HEROES SAS GSE/AppController.m	
+++ b/HEROES SAS GSE/AppController.m	
@@ -135,34 +135,30 @@ -(void)awakeFromNib{
     NumberInRangeFormatter *formatter;
     
     formatter = [self.SAS1CPUTemperatureLabel formatter];
-    formatter.maximum = 90;
-    formatter.minimum = -20;
+    formatter.maximum = 70;
+    formatter.minimum = 5;
     formatter = [self.SAS2CPUTemperatureLabel formatter];
-    formatter.maximum = 90;
-    formatter.minimum = -20;
+    formatter.maximum = 70;
+    formatter.minimum = 5;
     formatter = [self.PYASFCameraTemperatureLabel formatter];
-    formatter.maximum = 90;
-    formatter.minimum = -20;
+    formatter.maximum = 55;
+    formatter.minimum = -25;
     formatter = [self.PYASRCameraTemperatureLabel formatter];
-    formatter.maximum = 90;
-    formatter.minimum = -20;
+    formatter.maximum = 55;
+    formatter.minimum = -25;
     formatter = [self.RASCameraTemperatureLabel formatter];
-    formatter.maximum = 90;
-    formatter.minimum = -20;
+    formatter.maximum = 55;
+    formatter.minimum = -25;
 
-    NumberInRangeFormatter *TemperatureFormatter = [[NumberInRangeFormatter alloc] init];
-    TemperatureFormatter.maximum = 100;
-    TemperatureFormatter.minimum = -20;
-    
     formatter = [self.SAS1CPUHeatSinkTemp formatter];
-    formatter.maximum = 100;
-    formatter.minimum = -20;
+    formatter.maximum = 70;
+    formatter.minimum = 5;
     formatter = [self.SAS1CanTemp formatter];
-    formatter.maximum = 100;
-    formatter.minimum = -20;
+    formatter.maximum = 70;
+    formatter.minimum = 10;
     formatter = [self.SAS1HDDTemp formatter];
-    formatter.maximum = 100;
-    formatter.minimum = -20;
+    formatter.maximum = 65;
+    formatter.minimum = 5;
     formatter = [self.SAS1HeaterPlateTemp formatter];
     formatter.maximum = 100;
     formatter.minimum = -20;
@@ -174,14 +170,14 @@ -(void)awakeFromNib{
     formatter.minimum = -20;
     
     formatter = [self.SAS2CPUHeatSinkTemp formatter];
-    formatter.maximum = 100;
-    formatter.minimum = -20;
+    formatter.maximum = 70;
+    formatter.minimum = 5;
     formatter = [self.SAS2CanTemp formatter];
-    formatter.maximum = 100;
-    formatter.minimum = -20;
+    formatter.maximum = 70;
+    formatter.minimum = 10;
     formatter = [self.SAS2HDDTemp formatter];
-    formatter.maximum = 100;
-    formatter.minimum = -20;
+    formatter.maximum = 65;
+    formatter.minimum = 5;
     formatter = [self.SAS2HeaterPlateTemp formatter];
     formatter.maximum = 100;
     formatter.minimum = -20;
@@ -213,32 +209,32 @@ -(void)awakeFromNib{
     formatter.minimum = 75;
     
     formatter = [self.SAS1V2p5Voltage formatter];
-    formatter.maximum = 2.5 * 1.20;
-    formatter.minimum = 2.5 * 0.80;
+    formatter.maximum = 2.5 * 1.10;
+    formatter.minimum = 2.5 * 0.90;
     formatter = [self.SAS2V2p5Voltage formatter];
-    formatter.maximum = 2.5 * 1.20;
-    formatter.minimum = 2.5 * 0.80;
+    formatter.maximum = 2.5 * 1.10;
+    formatter.minimum = 2.5 * 0.90;
     
     formatter = [self.SAS1V3p3Voltage formatter];
-    formatter.maximum = 3.3 * 1.20;
-    formatter.minimum = 3.3 * 0.80;
+    formatter.maximum = 3.3 * 1.10;
+    formatter.minimum = 3.3 * 0.90;
     formatter = [self.SAS2V3p3Voltage formatter];
-    formatter.maximum = 3.3 * 1.20;
-    formatter.minimum = 3.3 * 0.80;
+    formatter.maximum = 3.3 * 1.10;
+    formatter.minimum = 3.3 * 0.90;
     
     formatter = [self.SAS1V5Votlage formatter];
-    formatter.maximum = 5.0 * 1.20;
-    formatter.minimum = 5.0 * 0.80;
+    formatter.maximum = 5.0 * 1.10;
+    formatter.minimum = 5.0 * 0.90;
     formatter = [self.SAS2V5Votlage formatter];
-    formatter.maximum = 5.0 * 1.20;
-    formatter.minimum = 5.0 * 0.80;
+    formatter.maximum = 5.0 * 1.10;
+    formatter.minimum = 5.0 * 0.90;
     
     formatter = [self.SAS1V12Voltage formatter];
-    formatter.maximum = 12.0 * 1.20;
-    formatter.minimum = 12.0 * 0.80;
+    formatter.maximum = 12.0 * 1.10;
+    formatter.minimum = 12.0 * 0.90;
     formatter = [self.SAS2V12Voltage formatter];
-    formatter.maximum = 12.0 * 1.20;
-    formatter.minimum = 12.0 * 0.80;
+    formatter.maximum = 12.0 * 1.10;
+    formatter.minimum = 12.0 * 0.90;
     
     for (NSString *title in self.PlotWindowsAvailable) {
             [self.TimeProfileMenu addItemWithTitle:title action:NULL keyEquivalent:@""];
@@ -601,6 +597,8 @@ - (void)mainThread_handleData:(NSNotification *)note
         self.PYASFcameraView.fiducialPoints = [packet getFiducialPoints];
         self.PYASFcameraView.fiducialIDs = [packet getFiducialIDs];
         [self.PYASFcameraView setScreenCenter:[packet.screenCenter pointValue].x :[packet.screenCenter pointValue].y];
+        [self.PYASFcameraView setCalibratedScreenCenter: [packet.calibratedScreenCenter pointValue].x :[packet.calibratedScreenCenter pointValue].y];
+
         self.PYASFcameraView.screenRadius = packet.screenRadius;
         self.PYASFcameraView.clockingAngle = packet.clockingAngle;
         
@@ -733,6 +731,7 @@ - (void)mainThread_handleData:(NSNotification *)note
         self.PYASRcameraView.chordCrossingPoints = [packet getChordPoints];
         self.PYASRcameraView.fiducialPoints = [packet getFiducialPoints];
         [self.PYASRcameraView setScreenCenter:[packet.screenCenter pointValue].x :[packet.screenCenter pointValue].y];
+        [self.PYASRcameraView setCalibratedScreenCenter: [packet.calibratedScreenCenter pointValue].x :[packet.calibratedScreenCenter pointValue].y];
         self.PYASRcameraView.screenRadius = packet.screenRadius;
         self.PYASRcameraView.clockingAngle = packet.clockingAngle;
         self.PYASRcameraView.fiducialIDs = [packet getFiducialIDs];
@@ -885,7 +884,7 @@ - (IBAction)OpenWindow_WindowMenuItemAction:(NSMenuItem *)sender {
                 NSArray *objs = [NSArray arrayWithObjects:[self.timeSeriesCollection objectForKey:@"PYAS-F camera temperature"], [self.timeSeriesCollection objectForKey:@"PYAS-R camera temperature"], [self.timeSeriesCollection objectForKey:@"RAS camera temperature"] ,nil];
                 NSArray *keys = [NSArray arrayWithObjects:@"PYAS-F", @"PYAS-R", @"RAS", nil];
                 NSDictionary *data = [[NSDictionary alloc] initWithObjects:objs forKeys:keys];
-                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data];
+                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data name:@"Camera Temperatures"];
                 [newPlotWindow showWindow:self];
                 [self.PlotWindows setObject:newPlotWindow forKey:userChoice];
             }
@@ -893,7 +892,7 @@ - (IBAction)OpenWindow_WindowMenuItemAction:(NSMenuItem *)sender {
                 NSDictionary *data = [[NSDictionary alloc] initWithObjectsAndKeys:
                                       [self.timeSeriesCollection objectForKey:@"SAS1 ctl X solution"], @"PYAS-F",
                                       [self.timeSeriesCollection objectForKey:@"SAS2 ctl X solution"] , @"PYAS-R", nil];
-                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data];
+                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data name:@"CTL X Solutions"];
                 [newPlotWindow showWindow:self];
                 [self.PlotWindows setObject:newPlotWindow forKey:userChoice];
             }
@@ -901,7 +900,7 @@ - (IBAction)OpenWindow_WindowMenuItemAction:(NSMenuItem *)sender {
                 NSDictionary *data = [[NSDictionary alloc] initWithObjectsAndKeys:
                                       [self.timeSeriesCollection objectForKey:@"SAS1 ctl Y solution"], @"PYAS-F",
                                       [self.timeSeriesCollection objectForKey:@"SAS2 ctl Y solution"] , @"PYAS-R", nil];
-                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data];
+                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data name:@"CTL Y Solutions"];
                 [newPlotWindow showWindow:self];
                 [self.PlotWindows setObject:newPlotWindow forKey:userChoice];
             }
@@ -909,15 +908,7 @@ - (IBAction)OpenWindow_WindowMenuItemAction:(NSMenuItem *)sender {
                 NSDictionary *data = [[NSDictionary alloc] initWithObjectsAndKeys:
                                       [self.timeSeriesCollection objectForKey:@"SAS1 ctl R solution"], @"PYAS-F",
                                       [self.timeSeriesCollection objectForKey:@"SAS2 ctl R solution"] , @"PYAS-R", nil];
-                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data];
-                [newPlotWindow showWindow:self];
-                [self.PlotWindows setObject:newPlotWindow forKey:userChoice];
-            }
-            if ([userChoice isEqualToString:@"cpu temperature"]) {
-                NSDictionary *data = [[NSDictionary alloc] initWithObjectsAndKeys:
-                                      [self.timeSeriesCollection objectForKey:@"SAS1 cpu temperature"], @"SAS-2",
-                                      [self.timeSeriesCollection objectForKey:@"SAS2 cpu temperature"] , @"SAS-1", nil];
-                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data];
+                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data name:@"CTL R Solutions"];
                 [newPlotWindow showWindow:self];
                 [self.PlotWindows setObject:newPlotWindow forKey:userChoice];
             }
@@ -931,7 +922,7 @@ - (IBAction)OpenWindow_WindowMenuItemAction:(NSMenuItem *)sender {
                                       [self.timeSeriesCollection objectForKey:@"SAS1 air temperature"] , @"air",
                                       [self.timeSeriesCollection objectForKey:@"SAS1 rail temperature"] , @"rail",
                                       nil];
-                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data];
+                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data name:@"SAS-1 Temperatures"];
                 [newPlotWindow showWindow:self];
                 [self.PlotWindows setObject:newPlotWindow forKey:userChoice];
             }
@@ -945,7 +936,7 @@ - (IBAction)OpenWindow_WindowMenuItemAction:(NSMenuItem *)sender {
                                       [self.timeSeriesCollection objectForKey:@"SAS2 air temperature"] , @"air",
                                       [self.timeSeriesCollection objectForKey:@"SAS2 rail temperature"] , @"rail",
                                       nil];
-                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data];
+                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data name:@"SAS-2 Temperatures"];
                 [newPlotWindow showWindow:self];
                 [self.PlotWindows setObject:newPlotWindow forKey:userChoice];
             }
@@ -957,7 +948,7 @@ - (IBAction)OpenWindow_WindowMenuItemAction:(NSMenuItem *)sender {
                                       [self.timeSeriesCollection objectForKey:@"SAS1 5.0V"] , @"5.0V",
                                       [self.timeSeriesCollection objectForKey:@"SAS1 12.0V"] , @"12.0V",
                                       nil];
-                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data];
+                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data name:@"SAS-1 Voltages"];
                 [newPlotWindow showWindow:self];
                 [self.PlotWindows setObject:newPlotWindow forKey:userChoice];
             }
@@ -969,7 +960,7 @@ - (IBAction)OpenWindow_WindowMenuItemAction:(NSMenuItem *)sender {
                                       [self.timeSeriesCollection objectForKey:@"SAS2 5.0V"] , @"5.0V",
                                       [self.timeSeriesCollection objectForKey:@"SAS2 12.0V"] , @"12.0V",
                                       nil];
-                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data];
+                PlotWindowController *newPlotWindow = [[PlotWindowController alloc] initWithData:data name:@"SAS-2 Voltages"];
                 [newPlotWindow showWindow:self];
                 [self.PlotWindows setObject:newPlotWindow forKey:userChoice];
             }
diff --git a/HEROES SAS GSE/CameraView.h b/HEROES SAS GSE/CameraView.h
index 8320f11..53cf4cc 100644
--- a/HEROES SAS GSE/CameraView.h	
+++ b/HEROES SAS GSE/CameraView.h	
@@ -26,5 +26,6 @@
 - (void) draw;
 - (void) setCircleCenter: (float)x :(float)y;
 - (void) setScreenCenter: (float)x :(float)y;
+- (void) setCalibratedScreenCenter: (float)x :(float)y;
 
 @end
diff --git a/HEROES SAS GSE/CameraView.m b/HEROES SAS GSE/CameraView.m
index b104ac6..c1d2635 100644
--- a/HEROES SAS GSE/CameraView.m	
+++ b/HEROES SAS GSE/CameraView.m	
@@ -20,6 +20,8 @@ @interface CameraView()
 @property (nonatomic) float circleY;
 @property (nonatomic) float screenX;
 @property (nonatomic) float screenY;
+@property (nonatomic) float calibratedScreenX;
+@property (nonatomic) float calibratedScreenY;
 
 // declaration of private methods as needed
 - (void) prepareOpenGL;
@@ -57,6 +59,8 @@ @implementation CameraView
 @synthesize screenY;
 @synthesize clockingAngle;
 @synthesize fiducialIDs = _fiducialIDs;
+@synthesize calibratedScreenX;
+@synthesize calibratedScreenY;
 
 -(id) initWithFrame:(NSRect)frameRect
 {
@@ -67,6 +71,8 @@ -(id) initWithFrame:(NSRect)frameRect
         self.circleY = 0.0;
         self.screenX = 500.0;
         self.screenY = 500.0;
+        self.calibratedScreenX = 525.0;
+        self.calibratedScreenY = 525.0;
         self.turnOnBkgImage = NO;
         self.imageExists = NO;
         self.mouseLocation = NSMakePoint(-1, -1);
@@ -95,6 +101,15 @@ - (void) setScreenCenter: (float)x :(float)y{
     }
 }
 
+- (void) setCalibratedScreenCenter: (float)x :(float)y{
+    if ((x < [self.numberXPixels floatValue]) && (x > 0)) {
+        self.calibratedScreenX = x;
+    }
+    if ((y < [self.numberYPixels floatValue]) && (y > 0)) {
+        self.calibratedScreenY = y;
+    }
+}
+
 -(void)setImageExists:(BOOL)imageExists{
     _imageExists = imageExists;
 }
@@ -148,6 +163,7 @@ - (void) drawOverlay
 {
     NSPoint sunCenter = NSMakePoint(self.circleX, self.circleY);
     NSPoint screenCenter = NSMakePoint(self.screenX, self.screenY);
+    NSPoint calibratedScreenCenter = NSMakePoint(self.calibratedScreenX, self.calibratedScreenY);
     
     // draw the Sun (circle and cross)
     glColor3f(1.0f, 0.0f, 0.0f);
@@ -164,8 +180,12 @@ - (void) drawOverlay
     
     // draw the screen center
     glColor3f(0.7f, 0.7f, 0.7f);
-    [self drawACross:screenCenter :0.02];
+    [self drawACross:screenCenter :0.015];
 
+    // draw the CALIBRATED screen center
+    glColor3f(0.7f, 0.7f, 0.0f);
+    [self drawACross:calibratedScreenCenter :0.02];
+    
     // draw the screen outline
     glColor3f(0.7f, 0.7f, 0.7f);
     [self drawACircle:screenCenter :self.screenRadius];
@@ -491,7 +511,7 @@ - (void) cleanUp
 //		[denoise release];
 //	} // if
     
-    //[super cleanUp];
+    //[super clean];
 } // cleanUp
 
 @end
diff --git a/HEROES SAS GSE/ConsoleWindowController.xib b/HEROES SAS GSE/ConsoleWindowController.xib
index e46e8e7..9275210 100644
--- a/HEROES SAS GSE/ConsoleWindowController.xib	
+++ b/HEROES SAS GSE/ConsoleWindowController.xib	
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12E55</string>
+		<string key="IBDocument.SystemVersion">12D78</string>
 		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
+		<string key="IBDocument.AppKitVersion">1187.37</string>
 		<string key="IBDocument.HIToolboxVersion">626.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -41,7 +41,7 @@
 			<object class="NSWindowTemplate" id="1005">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{784, 131}, {882, 263}}</string>
+				<string key="NSWindowRect">{{245, 901}, {760, 263}}</string>
 				<int key="NSWTFlags">544735232</int>
 				<string key="NSWindowTitle">GSE Console</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -62,10 +62,10 @@
 										<object class="NSTextView" id="345190000">
 											<reference key="NSNextResponder" ref="908732267"/>
 											<int key="NSvFlags">2322</int>
-											<string key="NSFrameSize">{882, 229}</string>
+											<string key="NSFrameSize">{730, 229}</string>
 											<reference key="NSSuperview" ref="908732267"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="1012789663"/>
+											<reference key="NSNextKeyView" ref="1066838380"/>
 											<string key="NSReuseIdentifierKey">_NS:13</string>
 											<object class="NSTextContainer" key="NSTextContainer" id="764660103">
 												<object class="NSLayoutManager" key="NSLayoutManager">
@@ -82,7 +82,7 @@
 													<nil key="NSDelegate"/>
 												</object>
 												<reference key="NSTextView" ref="345190000"/>
-												<double key="NSWidth">882</double>
+												<double key="NSWidth">730</double>
 												<int key="NSTCFlags">1</int>
 											</object>
 											<object class="NSTextViewSharedData" key="NSSharedData">
@@ -134,7 +134,7 @@
 											<nil key="NSDelegate"/>
 										</object>
 									</array>
-									<string key="NSFrame">{{1, 1}, {882, 229}}</string>
+									<string key="NSFrame">{{1, 1}, {745, 229}}</string>
 									<reference key="NSSuperview" ref="161096526"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="345190000"/>
@@ -299,7 +299,7 @@ wGw</bytes>
 								<object class="NSScroller" id="1066838380">
 									<reference key="NSNextResponder" ref="161096526"/>
 									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{867, 1}, {16, 229}}</string>
+									<string key="NSFrame">{{746, 1}, {15, 229}}</string>
 									<reference key="NSSuperview" ref="161096526"/>
 									<reference key="NSWindow"/>
 									<string key="NSReuseIdentifierKey">_NS:83</string>
@@ -324,10 +324,10 @@ wGw</bytes>
 									<double key="NSPercent">0.94565218687057495</double>
 								</object>
 							</array>
-							<string key="NSFrame">{{-1, -1}, {884, 231}}</string>
+							<string key="NSFrame">{{-1, -1}, {762, 231}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="908732267"/>
+							<reference key="NSNextKeyView" ref="1012789663"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<int key="NSsFlags">133138</int>
 							<reference key="NSVScroller" ref="1066838380"/>
@@ -340,7 +340,7 @@ wGw</bytes>
 						<object class="NSButton" id="127840191">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{728, 230}, {67, 32}}</string>
+							<string key="NSFrame">{{606, 230}, {67, 32}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="464339723"/>
@@ -369,7 +369,7 @@ wGw</bytes>
 						<object class="NSButton" id="464339723">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{795, 230}, {73, 32}}</string>
+							<string key="NSFrame">{{673, 230}, {73, 32}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="161096526"/>
@@ -394,7 +394,7 @@ wGw</bytes>
 						<object class="NSButton" id="303880377">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{573, 230}, {155, 32}}</string>
+							<string key="NSFrame">{{451, 230}, {155, 32}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="127840191"/>
@@ -419,9 +419,10 @@ wGw</bytes>
 						<object class="NSButton" id="45617997">
 							<reference key="NSNextResponder" ref="1006"/>
 							<int key="NSvFlags">268</int>
-							<string key="NSFrame">{{441, 238}, {132, 18}}</string>
+							<string key="NSFrame">{{319, 238}, {132, 18}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="303880377"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="23944371">
@@ -448,12 +449,12 @@ wGw</bytes>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
 					</array>
-					<string key="NSFrameSize">{882, 263}</string>
+					<string key="NSFrameSize">{760, 263}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
-					<reference key="NSNextKeyView" ref="303880377"/>
+					<reference key="NSNextKeyView" ref="45617997"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
diff --git a/HEROES SAS GSE/DataPacket.h b/HEROES SAS GSE/DataPacket.h
index 5538f41..eead20c 100644
--- a/HEROES SAS GSE/DataPacket.h	
+++ b/HEROES SAS GSE/DataPacket.h	
@@ -23,6 +23,7 @@
 @property (nonatomic) BOOL isSAS1;
 @property (nonatomic) BOOL isSAS2;
 @property (nonatomic) NSValue *screenCenter;
+@property (nonatomic) NSValue *calibratedScreenCenter;
 @property (nonatomic) float screenRadius;
 @property (nonatomic) NSMutableArray *i2cTemperatures;
 @property (nonatomic) NSMutableArray *sbcVoltages;
@@ -35,6 +36,7 @@
 @property (nonatomic) NSString *aspectErrorCode;
 @property (nonatomic) float clockingAngle;
 @property (nonatomic) NSValue *screenCenterOffset;
+@property (nonatomic) NSValue *calibratedScreenCenterOffset;
 
 -(NSString *) getframeTimeString;
 -(void) addChordPoint: (NSPoint) point :(int) index;
diff --git a/HEROES SAS GSE/DataPacket.m b/HEROES SAS GSE/DataPacket.m
index 69f8dc8..baadd0e 100644
--- a/HEROES SAS GSE/DataPacket.m	
+++ b/HEROES SAS GSE/DataPacket.m	
@@ -15,14 +15,14 @@
 #define NUM_VOLTAGE_READINGS 5
 
 //Calibrated parameters
-#define CLOCKING_ANGLE_PYASF -33.26
-#define CENTER_X_PYASF 0
-#define CENTER_Y_PYASF 0
-#define TWIST_PYASF 180.0
-#define CLOCKING_ANGLE_PYASR -53.00
-#define CENTER_X_PYASR -210
-#define CENTER_Y_PYASR 56
-#define TWIST_PYASR 0.0
+#define CLOCKING_ANGLE_PYASF -32.425 //model is -33.26
+#define CENTER_X_PYASF    124.68 //mils
+#define CENTER_Y_PYASF    -74.64 //mils
+#define TWIST_PYASF 180.0 //needs to be ~180
+#define CLOCKING_ANGLE_PYASR -52.175 //model is -53.26
+#define CENTER_X_PYASR -105.59 //mils
+#define CENTER_Y_PYASR   -48.64 //mils
+#define TWIST_PYASR 0.0 //needs to be ~0
 
 @interface DataPacket()
 @property (nonatomic, strong) NSMutableArray *chordPoints;
@@ -59,6 +59,8 @@ @implementation DataPacket
 @synthesize aspectErrorCode;
 @synthesize clockingAngle;
 @synthesize screenCenterOffset;
+@synthesize calibratedScreenCenter = _calibratedScreenCenter;
+@synthesize calibratedScreenCenterOffset = _calibratedScreenCenterOffset;
 
 -(id)init{
     self = [super init]; // call our super’s designated initializer
@@ -135,6 +137,23 @@ - (NSValue *)screenCenter
     return _screenCenter;
 }
 
+- (NSValue *)calibratedScreenCenter
+{
+    if (_calibratedScreenCenter == nil) {
+        _calibratedScreenCenter = [[NSValue alloc] init];
+    }
+    return _calibratedScreenCenter;
+}
+
+- (NSValue *)calibratedScreenCenterOffset
+{
+    if (_calibratedScreenCenterOffset == nil) {
+        _calibratedScreenCenterOffset = [[NSValue alloc] init];
+    }
+    return _calibratedScreenCenterOffset;
+}
+
+
 - (NSValue *)CTLCommand
 {
     if (_CTLCommand == nil) {
@@ -175,19 +194,17 @@ -(void)setIsSAS1:(BOOL)isSAS1{
     _isSAS2 = !isSAS1;
     if (isSAS1) {
         self.clockingAngle = CLOCKING_ANGLE_PYASF+TWIST_PYASF+180;
+        self.calibratedScreenCenterOffset = [NSValue valueWithPoint:NSMakePoint(CENTER_X_PYASF, CENTER_Y_PYASF)];
     } else {
         self.clockingAngle = CLOCKING_ANGLE_PYASR+TWIST_PYASR+180;
+        self.calibratedScreenCenterOffset = [NSValue valueWithPoint:NSMakePoint(CENTER_X_PYASR, CENTER_Y_PYASR)];
     }
 }
 
 -(void)setIsSAS2:(BOOL)isSAS2{
     _isSAS2 = isSAS2;
     _isSAS1 = !isSAS2;
-    if (isSAS2) {
-        self.clockingAngle = CLOCKING_ANGLE_PYASR+TWIST_PYASR+180;
-    } else {
-        self.clockingAngle = CLOCKING_ANGLE_PYASF+TWIST_PYASF+180;
-    }
+    [self setIsSAS1:!isSAS2];
 }
 
 @end
diff --git a/HEROES SAS GSE/DataSeries.m b/HEROES SAS GSE/DataSeries.m
index db01bea..f51f00c 100644
--- a/HEROES SAS GSE/DataSeries.m	
+++ b/HEROES SAS GSE/DataSeries.m	
@@ -8,7 +8,7 @@
 
 #import "DataSeries.h"
 
-#define MAX_CAPACITY 1000
+#define MAX_CAPACITY 100
 
 @interface DataSeries()
 -(float)calculateAverage;
diff --git a/HEROES SAS GSE/NumberInRangeFormatter.m b/HEROES SAS GSE/NumberInRangeFormatter.m
index afa3d4a..e1d4fbb 100644
--- a/HEROES SAS GSE/NumberInRangeFormatter.m	
+++ b/HEROES SAS GSE/NumberInRangeFormatter.m	
@@ -58,16 +58,15 @@ - (NSAttributedString *)attributedStringForObjectValue:(id)anObject withDefaultA
     if ([[attrString string] floatValue] < self.minimum)
     {
         NSDictionary *firstAttributes = @{
-                                          NSBackgroundColorAttributeName: [NSColor blueColor]};
+                                          NSBackgroundColorAttributeName: [NSColor blueColor], NSForegroundColorAttributeName: [NSColor whiteColor]};
         [attrString addAttributes:firstAttributes range:NSMakeRange(0, stringLength)];
     }
     if ([[attrString string] floatValue] > self.maximum)
     {
         NSDictionary *firstAttributes = @{
-                                          NSBackgroundColorAttributeName: [NSColor redColor]};
+                                          NSBackgroundColorAttributeName: [NSColor redColor], NSForegroundColorAttributeName: [NSColor whiteColor]};
         [attrString addAttributes:firstAttributes range:NSMakeRange(0, stringLength)];
     }
-   
     return attrString;
 }
 
diff --git a/HEROES SAS GSE/ParseDataOperation.m b/HEROES SAS GSE/ParseDataOperation.m
index 3672037..aca5197 100644
--- a/HEROES SAS GSE/ParseDataOperation.m	
+++ b/HEROES SAS GSE/ParseDataOperation.m	
@@ -227,6 +227,7 @@ - (void)main
                             
                             dataPacket.screenCenter = [NSValue valueWithPoint:NSMakePoint(-x_intercept/x_slope, -y_intercept/y_slope)];
                             dataPacket.screenRadius = 0.5* ((3000.0/fabs(x_slope)) + (3000.0/fabs(y_slope)));
+                            dataPacket.calibratedScreenCenter = [NSValue valueWithPoint:NSMakePoint((-x_intercept + dataPacket.calibratedScreenCenterOffset.pointValue.x)/x_slope, (-y_intercept + dataPacket.calibratedScreenCenterOffset.pointValue.y)/y_slope)];
                             
                             uint8_t image_max;
                             tm_packet >> image_max;
diff --git a/HEROES SAS GSE/PlotWindowController.h b/HEROES SAS GSE/PlotWindowController.h
index c3c0c63..dbba3fb 100644
--- a/HEROES SAS GSE/PlotWindowController.h	
+++ b/HEROES SAS GSE/PlotWindowController.h	
@@ -28,5 +28,5 @@
 @property (nonatomic, strong) NSDictionary *data;
 
 -(void) update;
-- (id)initWithData:(NSDictionary *)inputdata;
+- (id)initWithData:(NSDictionary *)inputdata name:(NSString *)string;
 @end
diff --git a/HEROES SAS GSE/PlotWindowController.m b/HEROES SAS GSE/PlotWindowController.m
index f50741b..840c674 100644
--- a/HEROES SAS GSE/PlotWindowController.m	
+++ b/HEROES SAS GSE/PlotWindowController.m	
@@ -76,8 +76,9 @@ - (id)init{
     return [super initWithWindowNibName:@"PlotWindowController"];
 }
 
-- (id)initWithData:(NSDictionary *)inputdata{
+- (id)initWithData:(NSDictionary *)inputdata name:(NSString *)string{
     self = [self init];
+    [self.MainWindow setTitle:string];
     self.data = inputdata;
     return self;
 }
@@ -134,7 +135,6 @@ - (void)windowDidLoad
             TimeSeries *currentData = [self.data objectForKey:key];
             if (i == 0) {
                 yAxis.title = currentData.name;
-                [self.MainWindow setTitle:currentData.name];
             }
             
             // Create a plot that uses the data source method
@@ -165,7 +165,7 @@ - (void)windowDidLoad
     self.hostView.hostedGraph = graph;
     
     [graph.defaultPlotSpace scaleToFitPlots:[graph allPlots]];
-    [graph reloadData];
+    [graph reloadDataIfNeeded];
     [self update];
 }
 #pragma mark -
@@ -177,8 +177,8 @@ - (IBAction)TextFieldUpdated:(NSTextField *)sender {
 
 -(void)update{
     if (self.data != nil) {
-        float ymin;
-        float ymax;
+        float ymin = 0;
+        float ymax = 100;
         // Axes
         CPTXYAxisSet *axisSet = (CPTXYAxisSet *)self.hostView.hostedGraph.axisSet;
         CPTXYAxis *yAxis = axisSet.yAxis;
@@ -245,8 +245,7 @@ -(void)update{
 
 -(NSNumber *)numberForPlot:(CPTPlot *)plot field:(NSUInteger)fieldEnum recordIndex:(NSUInteger)index
 {
-    NSString *plot_name = plot.identifier;
-    TimeSeries *currentData = [self.data objectForKey:plot_name];
+    TimeSeries *currentData = [self.data objectForKey:plot.identifier];
     
     if (fieldEnum == CPTScatterPlotFieldX) {
         NSTimeInterval x = [[[currentData time] objectAtIndex:index] timeIntervalSinceDate:self.earliestTime];
@@ -260,8 +259,7 @@ -(NSNumber *)numberForPlot:(CPTPlot *)plot field:(NSUInteger)fieldEnum recordInd
 
 -(NSUInteger)numberOfRecordsForPlot:(CPTPlot *)plot
 {
-    NSString *plot_name = plot.identifier;
-    TimeSeries *currentData = [self.data objectForKey:plot_name];
+    TimeSeries *currentData = [self.data objectForKey:plot.identifier];
     return [[currentData data] count];
 }
 
diff --git a/HEROES SAS GSE/PlotWindowController.xib b/HEROES SAS GSE/PlotWindowController.xib
index 5aba1cc..22d3dd3 100644
--- a/HEROES SAS GSE/PlotWindowController.xib	
+++ b/HEROES SAS GSE/PlotWindowController.xib	
@@ -274,10 +274,11 @@
 							<string key="NSFrame">{{540, 12}, {106, 24}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSSegmentedCell" key="NSCell" id="837839340">
-								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags">603979776</int>
 								<int key="NSCellFlags2">0</int>
 								<reference key="NSSupport" ref="318416775"/>
 								<string key="NSCellIdentifier">_NS:9</string>
@@ -1230,6 +1231,14 @@
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">CPTGraphHostingView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/CPTGraphHostingView.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSLayoutConstraint</string>
 					<string key="superclassName">NSObject</string>
diff --git a/HEROES SAS GSE/TimeSeries.m b/HEROES SAS GSE/TimeSeries.m
index 67faa3b..ac8f34d 100644
--- a/HEROES SAS GSE/TimeSeries.m	
+++ b/HEROES SAS GSE/TimeSeries.m	
@@ -9,7 +9,7 @@
 #import "DataSeries.h"
 #import "TimeSeries.h"
 
-#define MAX_CAPACITY 1000
+#define MAX_CAPACITY 100
 
 @interface TimeSeries()
 @property (nonatomic, strong) NSMutableArray *mytime;
diff --git a/HEROES SAS GSE/en.lproj/MainMenu.xib b/HEROES SAS GSE/en.lproj/MainMenu.xib
index e966024..a1365a6 100644
--- a/HEROES SAS GSE/en.lproj/MainMenu.xib	
+++ b/HEROES SAS GSE/en.lproj/MainMenu.xib	
@@ -1326,8 +1326,8 @@
 			<object class="NSWindowTemplate" id="972006081">
 				<int key="NSWindowStyleMask">7</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{442, 488}, {1147, 941}}</string>
-				<int key="NSWTFlags">1949827072</int>
+				<string key="NSWindowRect">{{118, 423}, {1147, 941}}</string>
+				<int key="NSWTFlags">1954021376</int>
 				<string key="NSWindowTitle">HEROES SAS GSE</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<nil key="NSViewClass"/>
@@ -3789,7 +3789,6 @@
 											<string key="NSFrame">{{59, 22}, {56, 22}}</string>
 											<reference key="NSSuperview" ref="348958171"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
 											<string key="NSAntiCompressionPriority">{1000, 750}</string>
 											<bool key="NSEnabled">YES</bool>
@@ -4232,7 +4231,7 @@
 										<object class="NSLevelIndicator" id="380564239">
 											<reference key="NSNextResponder" ref="597301802"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{196, 62}, {40, 18}}</string>
+											<string key="NSFrame">{{196, 61}, {40, 18}}</string>
 											<reference key="NSSuperview" ref="597301802"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="11574439"/>
@@ -4254,7 +4253,7 @@
 										<object class="NSTextField" id="536910833">
 											<reference key="NSNextResponder" ref="597301802"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{18, 65}, {50, 17}}</string>
+											<string key="NSFrame">{{15, 65}, {53, 17}}</string>
 											<reference key="NSSuperview" ref="597301802"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="1042693307"/>
@@ -4275,7 +4274,7 @@
 										<object class="NSTextField" id="167609306">
 											<reference key="NSNextResponder" ref="597301802"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{119, 64}, {72, 17}}</string>
+											<string key="NSFrame">{{119, 63}, {72, 17}}</string>
 											<reference key="NSSuperview" ref="597301802"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="380564239"/>
@@ -4296,7 +4295,7 @@
 										<object class="NSLevelIndicator" id="680158834">
 											<reference key="NSNextResponder" ref="597301802"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{196, 39}, {40, 17}}</string>
+											<string key="NSFrame">{{196, 39}, {40, 16}}</string>
 											<reference key="NSSuperview" ref="597301802"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="302123873"/>
@@ -4336,31 +4335,10 @@
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
-										<object class="NSTextField" id="185632729">
-											<reference key="NSNextResponder" ref="597301802"/>
-											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{18, 41}, {50, 16}}</string>
-											<reference key="NSSuperview" ref="597301802"/>
-											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="286082159"/>
-											<string key="NSReuseIdentifierKey">_NS:1535</string>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTextFieldCell" key="NSCell" id="125562175">
-												<int key="NSCellFlags">68157504</int>
-												<int key="NSCellFlags2">272630784</int>
-												<string key="NSContents">SAS-2</string>
-												<reference key="NSSupport" ref="540291167"/>
-												<string key="NSCellIdentifier">_NS:1535</string>
-												<reference key="NSControlView" ref="185632729"/>
-												<reference key="NSBackgroundColor" ref="470459070"/>
-												<reference key="NSTextColor" ref="210965976"/>
-											</object>
-											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-										</object>
 										<object class="NSTextField" id="11574439">
 											<reference key="NSNextResponder" ref="597301802"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{241, 64}, {51, 17}}</string>
+											<string key="NSFrame">{{241, 63}, {51, 17}}</string>
 											<reference key="NSSuperview" ref="597301802"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="1040744193"/>
@@ -4381,10 +4359,9 @@
 										<object class="NSTextField" id="302123873">
 											<reference key="NSNextResponder" ref="597301802"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{241, 39}, {51, 17}}</string>
+											<string key="NSFrame">{{241, 38}, {51, 17}}</string>
 											<reference key="NSSuperview" ref="597301802"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="947245186"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="571283357">
@@ -4423,7 +4400,7 @@
 										<object class="NSCustomView" id="1042693307">
 											<reference key="NSNextResponder" ref="597301802"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{74, 64}, {40, 23}}</string>
+											<string key="NSFrame">{{74, 62}, {40, 23}}</string>
 											<reference key="NSSuperview" ref="597301802"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="167609306"/>
@@ -4433,7 +4410,7 @@
 										<object class="NSCustomView" id="1040744193">
 											<reference key="NSNextResponder" ref="597301802"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{297, 61}, {40, 23}}</string>
+											<string key="NSFrame">{{297, 59}, {40, 25}}</string>
 											<reference key="NSSuperview" ref="597301802"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="859555588"/>
@@ -4443,7 +4420,7 @@
 										<object class="NSCustomView" id="947245186">
 											<reference key="NSNextResponder" ref="597301802"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{297, 37}, {40, 23}}</string>
+											<string key="NSFrame">{{297, 36}, {40, 24}}</string>
 											<reference key="NSSuperview" ref="597301802"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="122983595"/>
@@ -4463,7 +4440,7 @@
 										<object class="NSCustomView" id="286082159">
 											<reference key="NSNextResponder" ref="597301802"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{74, 36}, {40, 23}}</string>
+											<string key="NSFrame">{{74, 35}, {40, 22}}</string>
 											<reference key="NSSuperview" ref="597301802"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="643413020"/>
@@ -4476,7 +4453,7 @@
 											<string key="NSFrame">{{425, 60}, {100, 26}}</string>
 											<reference key="NSSuperview" ref="597301802"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="185632729"/>
+											<reference key="NSNextKeyView" ref="286082159"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="801811447">
@@ -4557,7 +4534,7 @@
 											<string key="NSFrame">{{366, 39}, {158, 18}}</string>
 											<reference key="NSSuperview" ref="597301802"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView"/>
+											<reference key="NSNextKeyView" ref="532593165"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="539043146">
@@ -4583,6 +4560,27 @@
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
+										<object class="NSTextField" id="532593165">
+											<reference key="NSNextResponder" ref="597301802"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{15, 38}, {43, 17}}</string>
+											<reference key="NSSuperview" ref="597301802"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="391804813"/>
+											<string key="NSReuseIdentifierKey">_NS:1535</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="248028969">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents">SAS-2</string>
+												<reference key="NSSupport" ref="540291167"/>
+												<string key="NSCellIdentifier">_NS:1535</string>
+												<reference key="NSControlView" ref="532593165"/>
+												<reference key="NSBackgroundColor" ref="470459070"/>
+												<reference key="NSTextColor" ref="210965976"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
 									</array>
 									<string key="NSFrame">{{1, 1}, {540, 91}}</string>
 									<reference key="NSSuperview" ref="289031695"/>
@@ -13357,6 +13355,22 @@
 						<int key="objectID">3487</int>
 						<reference key="object" ref="289031695"/>
 						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="458826221">
+								<reference key="firstItem" ref="1045127330"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="11574439"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="289031695"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="628486828">
 								<reference key="firstItem" ref="1045127330"/>
 								<int key="firstAttribute">3</int>
@@ -13405,28 +13419,12 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="26732780">
+							<object class="IBNSLayoutConstraint" id="618656035">
 								<reference key="firstItem" ref="122983595"/>
-								<int key="firstAttribute">10</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="947245186"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="289031695"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="458826221">
-								<reference key="firstItem" ref="122983595"/>
-								<int key="firstAttribute">4</int>
+								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="680158834"/>
-								<int key="secondAttribute">4</int>
+								<reference key="secondItem" ref="302123873"/>
+								<int key="secondAttribute">3</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">0.0</double>
@@ -13741,6 +13739,22 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
+							<object class="IBNSLayoutConstraint" id="937708328">
+								<reference key="firstItem" ref="289031695"/>
+								<int key="firstAttribute">4</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="391804813"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">12</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="289031695"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">3</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="905008995">
 								<reference key="firstItem" ref="391804813"/>
 								<int key="firstAttribute">5</int>
@@ -13933,22 +13947,6 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="859808530">
-								<reference key="firstItem" ref="643413020"/>
-								<int key="firstAttribute">11</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="185632729"/>
-								<int key="secondAttribute">11</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="289031695"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
 							<object class="IBNSLayoutConstraint" id="1014493950">
 								<reference key="firstItem" ref="167609306"/>
 								<int key="firstAttribute">5</int>
@@ -13997,23 +13995,7 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="713568838">
-								<reference key="firstItem" ref="286082159"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1042693307"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="289031695"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="120522443">
+							<object class="IBNSLayoutConstraint" id="420806210">
 								<reference key="firstItem" ref="286082159"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
@@ -14021,7 +14003,7 @@
 								<int key="secondAttribute">3</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">47</double>
+									<double key="value">49</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="289031695"/>
@@ -14029,23 +14011,23 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="459816440">
+							<object class="IBNSLayoutConstraint" id="713568838">
 								<reference key="firstItem" ref="286082159"/>
-								<int key="firstAttribute">10</int>
+								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="302123873"/>
-								<int key="secondAttribute">10</int>
+								<reference key="secondItem" ref="1042693307"/>
+								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">0.0</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="289031695"/>
-								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">40</float>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="260096720">
+							<object class="IBNSLayoutConstraint" id="609216190">
 								<reference key="firstItem" ref="1042693307"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
@@ -14053,7 +14035,7 @@
 								<int key="secondAttribute">3</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">19</double>
+									<double key="value">21</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="289031695"/>
@@ -14061,28 +14043,12 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="656020405">
-								<reference key="firstItem" ref="289031695"/>
-								<int key="firstAttribute">4</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="1042693307"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">61</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="289031695"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="20063841">
+							<object class="IBNSLayoutConstraint" id="26732780">
 								<reference key="firstItem" ref="1042693307"/>
-								<int key="firstAttribute">4</int>
+								<int key="firstAttribute">10</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="167609306"/>
-								<int key="secondAttribute">4</int>
+								<reference key="secondItem" ref="536910833"/>
+								<int key="secondAttribute">10</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">0.0</double>
@@ -14109,12 +14075,12 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="91036096">
-								<reference key="firstItem" ref="185632729"/>
-								<int key="firstAttribute">6</int>
+							<object class="IBNSLayoutConstraint" id="859808530">
+								<reference key="firstItem" ref="532593165"/>
+								<int key="firstAttribute">11</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="536910833"/>
-								<int key="secondAttribute">6</int>
+								<reference key="secondItem" ref="302123873"/>
+								<int key="secondAttribute">11</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">0.0</double>
@@ -14125,12 +14091,12 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="239797597">
-								<reference key="firstItem" ref="185632729"/>
-								<int key="firstAttribute">5</int>
+							<object class="IBNSLayoutConstraint" id="633709057">
+								<reference key="firstItem" ref="532593165"/>
+								<int key="firstAttribute">10</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="536910833"/>
-								<int key="secondAttribute">5</int>
+								<reference key="secondItem" ref="286082159"/>
+								<int key="secondAttribute">10</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
 									<double key="value">0.0</double>
@@ -14141,39 +14107,23 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="606627728">
-								<reference key="firstItem" ref="185632729"/>
-								<int key="firstAttribute">3</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="536910833"/>
-								<int key="secondAttribute">4</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">8</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="289031695"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">3</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="608795069">
-								<reference key="firstItem" ref="289031695"/>
-								<int key="firstAttribute">4</int>
+							<object class="IBNSLayoutConstraint" id="297321019">
+								<reference key="firstItem" ref="532593165"/>
+								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="536910833"/>
-								<int key="secondAttribute">4</int>
+								<reference key="secondItem" ref="289031695"/>
+								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">62</double>
+									<double key="value">16</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="289031695"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">5</float>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="829085415">
+							<object class="IBNSLayoutConstraint" id="669461089">
 								<reference key="firstItem" ref="536910833"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
@@ -14181,16 +14131,15 @@
 								<int key="secondAttribute">5</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">19</double>
+									<double key="value">16</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="289031695"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
 							<reference ref="536910833"/>
-							<reference ref="185632729"/>
 							<reference ref="167609306"/>
 							<reference ref="380564239"/>
 							<reference ref="680158834"/>
@@ -14206,6 +14155,7 @@
 							<reference ref="286082159"/>
 							<reference ref="122983595"/>
 							<reference ref="1042693307"/>
+							<reference ref="532593165"/>
 						</array>
 						<reference key="parent" ref="439893737"/>
 					</object>
@@ -14224,7 +14174,7 @@
 						<reference key="object" ref="536910833"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="327291986"/>
-							<object class="IBNSLayoutConstraint" id="976949086">
+							<object class="IBNSLayoutConstraint" id="850442250">
 								<reference key="firstItem" ref="536910833"/>
 								<int key="firstAttribute">7</int>
 								<int key="relation">0</int>
@@ -14232,7 +14182,7 @@
 								<int key="secondAttribute">0</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">44</double>
+									<double key="value">47</double>
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="536910833"/>
@@ -14248,34 +14198,6 @@
 						<reference key="object" ref="327291986"/>
 						<reference key="parent" ref="536910833"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3519</int>
-						<reference key="object" ref="829085415"/>
-						<reference key="parent" ref="289031695"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3524</int>
-						<reference key="object" ref="185632729"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="125562175"/>
-						</array>
-						<reference key="parent" ref="289031695"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3526</int>
-						<reference key="object" ref="125562175"/>
-						<reference key="parent" ref="185632729"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3534</int>
-						<reference key="object" ref="606627728"/>
-						<reference key="parent" ref="289031695"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3535</int>
-						<reference key="object" ref="239797597"/>
-						<reference key="parent" ref="289031695"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3538</int>
 						<reference key="object" ref="770593414"/>
@@ -14376,11 +14298,6 @@
 						<reference key="object" ref="26922377"/>
 						<reference key="parent" ref="289031695"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3633</int>
-						<reference key="object" ref="91036096"/>
-						<reference key="parent" ref="289031695"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3640</int>
 						<reference key="object" ref="905008995"/>
@@ -14552,6 +14469,22 @@
 						<reference key="object" ref="680158834"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="286360399"/>
+							<object class="IBNSLayoutConstraint" id="537944503">
+								<reference key="firstItem" ref="680158834"/>
+								<int key="firstAttribute">8</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">14</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="680158834"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
 						</array>
 						<reference key="parent" ref="289031695"/>
 					</object>
@@ -14588,11 +14521,6 @@
 						<reference key="object" ref="438576757"/>
 						<reference key="parent" ref="289031695"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3839</int>
-						<reference key="object" ref="859808530"/>
-						<reference key="parent" ref="289031695"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3872</int>
 						<reference key="object" ref="547405961"/>
@@ -14676,11 +14604,6 @@
 						<reference key="object" ref="769907221"/>
 						<reference key="parent" ref="68690526"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">3968</int>
-						<reference key="object" ref="976949086"/>
-						<reference key="parent" ref="536910833"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">3971</int>
 						<reference key="object" ref="856883488"/>
@@ -14827,11 +14750,6 @@
 						<reference key="object" ref="286082159"/>
 						<reference key="parent" ref="289031695"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4073</int>
-						<reference key="object" ref="459816440"/>
-						<reference key="parent" ref="289031695"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">4082</int>
 						<reference key="object" ref="1040744193"/>
@@ -14935,11 +14853,6 @@
 						<reference key="object" ref="77670974"/>
 						<reference key="parent" ref="538183545"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">4293</int>
-						<reference key="object" ref="120522443"/>
-						<reference key="parent" ref="289031695"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">4299</int>
 						<reference key="object" ref="242756450"/>
@@ -16568,11 +16481,6 @@
 						<reference key="object" ref="623990322"/>
 						<reference key="parent" ref="289031695"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5894</int>
-						<reference key="object" ref="913955093"/>
-						<reference key="parent" ref="289031695"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">5708</int>
 						<reference key="object" ref="199386552"/>
@@ -17328,22 +17236,6 @@
 						<reference key="object" ref="122983595"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="539043146"/>
-							<object class="IBNSLayoutConstraint" id="537944503">
-								<reference key="firstItem" ref="122983595"/>
-								<int key="firstAttribute">8</int>
-								<int key="relation">0</int>
-								<nil key="secondItem"/>
-								<int key="secondAttribute">0</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">14</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="122983595"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
 						</array>
 						<reference key="parent" ref="289031695"/>
 					</object>
@@ -17367,21 +17259,6 @@
 						<reference key="object" ref="952020682"/>
 						<reference key="parent" ref="289031695"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6339</int>
-						<reference key="object" ref="537944503"/>
-						<reference key="parent" ref="122983595"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6340</int>
-						<reference key="object" ref="458826221"/>
-						<reference key="parent" ref="289031695"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6341</int>
-						<reference key="object" ref="26732780"/>
-						<reference key="parent" ref="289031695"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">6342</int>
 						<reference key="object" ref="496833721"/>
@@ -17868,23 +17745,81 @@
 						<reference key="parent" ref="289031695"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">6468</int>
-						<reference key="object" ref="20063841"/>
+						<int key="objectID">6476</int>
+						<reference key="object" ref="669461089"/>
 						<reference key="parent" ref="289031695"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">6469</int>
-						<reference key="object" ref="656020405"/>
+						<int key="objectID">6479</int>
+						<reference key="object" ref="850442250"/>
+						<reference key="parent" ref="536910833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6482</int>
+						<reference key="object" ref="26732780"/>
+						<reference key="parent" ref="289031695"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6483</int>
+						<reference key="object" ref="609216190"/>
+						<reference key="parent" ref="289031695"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6497</int>
+						<reference key="object" ref="458826221"/>
+						<reference key="parent" ref="289031695"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6498</int>
+						<reference key="object" ref="618656035"/>
+						<reference key="parent" ref="289031695"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6500</int>
+						<reference key="object" ref="537944503"/>
+						<reference key="parent" ref="680158834"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6506</int>
+						<reference key="object" ref="913955093"/>
+						<reference key="parent" ref="289031695"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6511</int>
+						<reference key="object" ref="420806210"/>
+						<reference key="parent" ref="289031695"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6514</int>
+						<reference key="object" ref="532593165"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="248028969"/>
+						</array>
 						<reference key="parent" ref="289031695"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">6470</int>
-						<reference key="object" ref="260096720"/>
+						<int key="objectID">6515</int>
+						<reference key="object" ref="248028969"/>
+						<reference key="parent" ref="532593165"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6518</int>
+						<reference key="object" ref="297321019"/>
 						<reference key="parent" ref="289031695"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">6471</int>
-						<reference key="object" ref="608795069"/>
+						<int key="objectID">6519</int>
+						<reference key="object" ref="633709057"/>
+						<reference key="parent" ref="289031695"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6520</int>
+						<reference key="object" ref="859808530"/>
+						<reference key="parent" ref="289031695"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6521</int>
+						<reference key="object" ref="937708328"/>
 						<reference key="parent" ref="289031695"/>
 					</object>
 				</array>
@@ -18360,22 +18295,18 @@
 				<string key="3480.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3481.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="3487.IBNSViewMetadataConstraints">
-					<reference ref="829085415"/>
-					<reference ref="608795069"/>
-					<reference ref="606627728"/>
-					<reference ref="239797597"/>
-					<reference ref="91036096"/>
+					<reference ref="669461089"/>
+					<reference ref="297321019"/>
+					<reference ref="633709057"/>
+					<reference ref="859808530"/>
 					<reference ref="159678548"/>
-					<reference ref="20063841"/>
-					<reference ref="656020405"/>
-					<reference ref="260096720"/>
-					<reference ref="459816440"/>
-					<reference ref="120522443"/>
+					<reference ref="26732780"/>
+					<reference ref="609216190"/>
 					<reference ref="713568838"/>
+					<reference ref="420806210"/>
 					<reference ref="856883488"/>
 					<reference ref="438779524"/>
 					<reference ref="1014493950"/>
-					<reference ref="859808530"/>
 					<reference ref="401624797"/>
 					<reference ref="435642445"/>
 					<reference ref="623745841"/>
@@ -18388,6 +18319,7 @@
 					<reference ref="934366004"/>
 					<reference ref="232534980"/>
 					<reference ref="905008995"/>
+					<reference ref="937708328"/>
 					<reference ref="721691632"/>
 					<reference ref="422784597"/>
 					<reference ref="707488398"/>
@@ -18407,11 +18339,11 @@
 					<reference ref="623990322"/>
 					<reference ref="735428309"/>
 					<reference ref="102619769"/>
-					<reference ref="458826221"/>
-					<reference ref="26732780"/>
+					<reference ref="618656035"/>
 					<reference ref="412416542"/>
 					<reference ref="861849375"/>
 					<reference ref="628486828"/>
+					<reference ref="458826221"/>
 				</array>
 				<boolean value="NO" key="3487.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="3487.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -18421,18 +18353,12 @@
 				<string key="3495.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="350.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="351.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="3517.IBNSViewMetadataConstraints">
-					<reference ref="976949086"/>
+				<array class="NSMutableArray" key="3517.IBNSViewMetadataConstraints">
+					<reference ref="850442250"/>
 				</array>
 				<boolean value="NO" key="3517.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="3517.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3518.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="3519.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="NO" key="3524.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="3524.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="3526.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="3534.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="3535.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="3538.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="3538.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3539.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -18456,7 +18382,6 @@
 				<string key="3607.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3608.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3626.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="3633.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3640.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="3648.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="3648.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -18470,7 +18395,7 @@
 				<boolean value="NO" key="3708.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="3708.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3709.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<boolean value="YES" key="371.IBNSWindowAutoPositionCentersHorizontal"/>
+				<boolean value="NO" key="371.IBNSWindowAutoPositionCentersHorizontal"/>
 				<boolean value="NO" key="371.IBNSWindowAutoPositionCentersVertical"/>
 				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="371.IBWindowTemplateEditedContentRect">{{380, 496}, {480, 360}}</string>
@@ -18516,6 +18441,14 @@
 				<boolean value="NO" key="3811.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="3811.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3812.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="3818.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="380564239"/>
+						<string key="toolTip">Green if clock sync is better than 1 ms</string>
+					</object>
+				</object>
 				<array key="3818.IBNSViewMetadataConstraints">
 					<reference ref="720788041"/>
 				</array>
@@ -18524,6 +18457,17 @@
 				<string key="3819.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3820.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3824.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="3825.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="680158834"/>
+						<string key="toolTip">Green if clock sync is better than 1 ms</string>
+					</object>
+				</object>
+				<array key="3825.IBNSViewMetadataConstraints">
+					<reference ref="537944503"/>
+				</array>
 				<boolean value="NO" key="3825.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="3825.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="3826.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -18533,7 +18477,6 @@
 				<string key="3832.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3834.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3838.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="3839.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="3872.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="3872.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="NO" key="3873.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -18562,7 +18505,6 @@
 				<string key="394.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="395.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="3968.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="397.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3971.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3972.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -18592,6 +18534,14 @@
 				<string key="4001.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="401.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="402.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="4024.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="1042693307"/>
+						<string key="toolTip">Green if receiving packets</string>
+					</object>
+				</object>
 				<boolean value="NO" key="4024.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="4024.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="403.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -18601,11 +18551,26 @@
 				<string key="406.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="4064.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="4065.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="4066.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="286082159"/>
+						<string key="toolTip">Green if receiving packets</string>
+					</object>
+				</object>
 				<boolean value="NO" key="4066.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="4066.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="407.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="4073.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="408.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="4082.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="1040744193"/>
+						<string key="toolTip">Green if temperature is not 0</string>
+					</object>
+				</object>
 				<boolean value="NO" key="4082.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="4082.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="4087.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -18613,6 +18578,14 @@
 				<string key="4089.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="409.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="4090.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="4091.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="947245186"/>
+						<string key="toolTip">Green if temperature is not 0</string>
+					</object>
+				</object>
 				<boolean value="NO" key="4091.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="4091.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="4096.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -18620,6 +18593,14 @@
 				<string key="4098.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="410.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="4100.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="4101.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="1057310045"/>
+						<string key="toolTip">Green if temperature is not 0</string>
+					</object>
+				</object>
 				<boolean value="NO" key="4101.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="4101.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="4106.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -18644,7 +18625,6 @@
 				<string key="4235.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="4248.CustomClassName">NumberInRangeFormatter</string>
 				<string key="4248.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="4293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="4299.CustomClassName">NumberInRangeFormatter</string>
 				<string key="4299.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="4300.CustomClassName">NumberInRangeFormatter</string>
@@ -19166,7 +19146,7 @@
 				<string key="5823.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5833.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5836.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="5871.IBNSViewMetadataConstraints">
+				<array class="NSMutableArray" key="5871.IBNSViewMetadataConstraints">
 					<reference ref="744022211"/>
 				</array>
 				<boolean value="NO" key="5871.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -19184,7 +19164,6 @@
 				<string key="5887.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5892.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5893.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="5894.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5933.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5934.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5937.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -19334,18 +19313,12 @@
 				<string key="6309.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6320.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<array key="6323.IBNSViewMetadataConstraints">
-					<reference ref="537944503"/>
-				</array>
 				<boolean value="NO" key="6323.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="6323.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6325.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6326.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6337.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="6339.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="6340.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="6341.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6342.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6343.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6345.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -19447,10 +19420,22 @@
 				<string key="6465.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6466.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6467.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="6468.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="6469.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="6470.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="6471.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6482.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6483.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6497.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6498.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6500.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6506.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6511.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="6514.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="6514.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6515.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6518.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6519.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6520.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6521.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -19473,7 +19458,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">6471</int>
+			<int key="maxID">6521</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/HEROES SAS GSE/lib/SAS-aspect b/HEROES SAS GSE/lib/SAS-aspect
index ea31ebf..fd6da28 160000
--- a/HEROES SAS GSE/lib/SAS-aspect	
+++ b/HEROES SAS GSE/lib/SAS-aspect	
@@ -1 +1 @@
-Subproject commit ea31ebfa09aa66c0f14202a60373faa9a1b9574b
+Subproject commit fd6da283dfcedb38b9151dfb2759754df37e17f1