                         self.siteLastReadingLabel?.textColor = self.defaultTextColor
                         
                         if configuration.displayRawData {
-
-                        // Raw label
-                        if let rawValue = watchEntry.raw {
-                            let color = colorForDesiredColorState(configuration.boundedColorForGlucoseValue(rawValue))
                             
-                            var raw = "\(rawValue.formattedForMgdl)"
-                            if configuration.displayUnits == .Mmol {
-                                raw = rawValue.formattedForMmol
+                            // Raw label
+                            if let rawValue = watchEntry.raw {
+                                let color = colorForDesiredColorState(configuration.boundedColorForGlucoseValue(rawValue))
+                                
+                                var raw = "\(rawValue.formattedForMgdl)"
+                                if configuration.displayUnits == .Mmol {
+                                    raw = rawValue.formattedForMmol
+                                }
+                                
+                                self.siteRawLabel?.textColor = color
+                                self.siteRawLabel?.text = "\(raw) : \(sgv.noise)"
                             }
-
-                            self.siteRawLabel?.textColor = color
-                            self.siteRawLabel?.text = "\(raw) : \(sgv.noise)"
-                        }
                         } else {
                             self.siteRawHeader?.hidden = true
                             self.siteRawLabel?.hidden = true

        if let popoverController = alertController.popoverPresentationController {
            popoverController.barButtonItem = sender
        }

        self.presentViewController(alertController, animated: true) {
            #if DEBUG
                print("presentViewController: \(alertController.debugDescription)")

            switch (result) {
            case let .Error(error):
                // display error message
                print("error: \(error)")
                self.navigationController?.popViewControllerAnimated(true)
                
            case let .Value(boxedConfiguration):
                let configuration:ServerConfiguration = boxedConfiguration.value
                // Get back on the main queue to update the user interface
                dispatch_async(dispatch_get_main_queue(), { () -> Void in
                    
                    self.updateTitles(configuration.displayName)
                    
                    if !configuration.displayRawData {
                        // self.rawHeader!.removeFromSuperview() // Screws with the layout contstraints.
                        // self.rawReadingLabel!.removeFromSuperview()
                        if let _ = self.siteRawHeader {
                            self.siteRawHeader?.hidden = true
                            self.siteRawLabel?.hidden = true
                        }
                    }
                    
                    self.updateData()
                })
            }
