From b07de8a8aef396395d680bbf72c2c6d44d3903c9 Mon Sep 17 00:00:00 2001
From: Nathan Racklyeft <loudnate@gmail.com>
Date: Wed, 28 Sep 2016 17:27:52 -0700
Subject: [PATCH 1/2] Graph improvements

 - New labels that highlight eventual glucose, current IOB, total delivery, and COB
 - Fixes #159
 - Dynamic selection of graph history length based on available display with. Rotate landscape to see more data.
 - New treatment for the recommended temp cell
---
 Loop.xcodeproj/project.pbxproj                |   4 +
 Loop/Base.lproj/Main.storyboard               | 123 +++++---
 Loop/Extensions/CollectionType.swift          |  23 ++
 Loop/Extensions/UIColor.swift                 |   2 +
 Loop/Managers/StatusChartManager.swift        | 151 +++++-----
 .../PredictionTableViewController.swift       | 141 ++++++---
 .../StatusTableViewController.swift           | 274 ++++++++++++------
 Loop/Views/ChartContentView.swift             |   9 +-
 ...rtPointsTouchHighlightLayerViewCache.swift |   9 +-
 Loop/Views/ChartTableViewCell.swift           |   4 +-
 Loop/Views/TitleSubtitleTableViewCell.swift   |  37 +++
 11 files changed, 528 insertions(+), 249 deletions(-)
 create mode 100644 Loop/Views/TitleSubtitleTableViewCell.swift

diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
index a425921ece..7861d5042c 100644
--- a/Loop.xcodeproj/project.pbxproj
+++ b/Loop.xcodeproj/project.pbxproj
@@ -141,6 +141,7 @@
 		43F5173D1D713DB0000FA422 /* RadioSelectionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F5173C1D713DB0000FA422 /* RadioSelectionTableViewController.swift */; };
 		43F5C2C91B929C09003EB13D /* HealthKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F5C2C81B929C09003EB13D /* HealthKit.framework */; };
 		43F5C2DB1B92A5E1003EB13D /* SettingsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F5C2DA1B92A5E1003EB13D /* SettingsTableViewController.swift */; };
+		43F64DD91D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */; };
 		43F78D261C8FC000002152D1 /* DoseMath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43F78D251C8FC000002152D1 /* DoseMath.swift */; };
 		43F78D4C1C914197002152D1 /* CarbKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D481C914197002152D1 /* CarbKit.framework */; };
 		43F78D4D1C914197002152D1 /* GlucoseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D491C914197002152D1 /* GlucoseKit.framework */; };
@@ -370,6 +371,7 @@
 		43F5C2D41B92A4A6003EB13D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		43F5C2D61B92A4DC003EB13D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		43F5C2DA1B92A5E1003EB13D /* SettingsTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = SettingsTableViewController.swift; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
+		43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TitleSubtitleTableViewCell.swift; sourceTree = "<group>"; };
 		43F78D251C8FC000002152D1 /* DoseMath.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DoseMath.swift; sourceTree = "<group>"; };
 		43F78D481C914197002152D1 /* CarbKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CarbKit.framework; path = Carthage/Build/iOS/CarbKit.framework; sourceTree = "<group>"; };
 		43F78D491C914197002152D1 /* GlucoseKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GlucoseKit.framework; path = Carthage/Build/iOS/GlucoseKit.framework; sourceTree = "<group>"; };
@@ -670,6 +672,7 @@
 				438D42FA1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift */,
 				437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */,
 				43A5676A1C96155700334FAC /* SwitchTableViewCell.swift */,
+				43F64DD81D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift */,
 				434F54621D28DD80002A9274 /* ValidatingIndicatorView.swift */,
 			);
 			path = Views;
@@ -1019,6 +1022,7 @@
 				43E344A41B9E1B1C00C85C07 /* NSUserDefaults.swift in Sources */,
 				43649A631C7A347F00523D7F /* CollectionType.swift in Sources */,
 				437CEEBE1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift in Sources */,
+				43F64DD91D9C92C900D24DC6 /* TitleSubtitleTableViewCell.swift in Sources */,
 				43EA28621D517E42001BC233 /* SensorDisplayable.swift in Sources */,
 				435400321C9F745500D5819C /* BolusSuggestionUserInfo.swift in Sources */,
 				43E3449F1B9D68E900C85C07 /* StatusTableViewController.swift in Sources */,
diff --git a/Loop/Base.lproj/Main.storyboard b/Loop/Base.lproj/Main.storyboard
index 7268a6fb07..58ad1c7ec0 100644
--- a/Loop/Base.lproj/Main.storyboard
+++ b/Loop/Base.lproj/Main.storyboard
@@ -13,15 +13,15 @@
             <objects>
                 <tableViewController id="4cb-Yq-02o" customClass="SettingsTableViewController" customModule="Loop" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="MhB-bL-wBN">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SwitchTableViewCell" id="vah-ss-3Ud" customClass="SwitchTableViewCell" customModule="Loop" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="119.5" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="120" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vah-ss-3Ud" id="D0A-EB-kmz">
-                                    <frame key="frameInset" width="375" height="43.5"/>
+                                    <frame key="frameInset" width="320" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="251" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="moR-fS-DWR">
@@ -46,21 +46,21 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ConfigTableViewCell" textLabel="5TX-kX-nBo" detailTextLabel="m9c-SQ-djE" style="IBUITableViewCellStyleValue1" id="0EG-OG-YuT">
-                                <rect key="frame" x="0.0" y="163.5" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="164" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0EG-OG-YuT" id="af2-sZ-CY0">
-                                    <frame key="frameInset" width="342" height="43.5"/>
+                                    <frame key="frameInset" width="287" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Pump ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5TX-kX-nBo">
-                                            <frame key="frameInset" minX="15" minY="12" width="65" height="20.5"/>
+                                            <frame key="frameInset" minX="15" minY="11" width="65" height="21"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Tap to set" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="m9c-SQ-djE">
-                                            <frame key="frameInset" minX="264" minY="12" width="76" height="20.5"/>
+                                            <frame key="frameInset" minX="209" minY="11" width="76" height="21"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" red="0.55676333109537768" green="0.55676333109537768" blue="0.55676333109537768" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -115,15 +115,15 @@
             <objects>
                 <tableViewController title="Predicted Glucose" hidesBottomBarWhenPushed="YES" id="PA3-sP-cWY" customClass="PredictionTableViewController" customModule="Loop" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="Hji-tK-Uch">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ChartTableViewCell" rowHeight="220" id="mQk-9D-0ub" customClass="ChartTableViewCell" customModule="Loop" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="92" width="375" height="220"/>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ChartTableViewCell" rowHeight="270" id="mQk-9D-0ub" customClass="ChartTableViewCell" customModule="Loop" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="92" width="320" height="270"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mQk-9D-0ub" id="B1i-Pw-wSw">
-                                    <frame key="frameInset" width="375" height="219.5"/>
+                                    <frame key="frameInset" width="320" height="269"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FBL-RL-faM" customClass="ChartContentView" customModule="Loop" customModuleProvider="target">
@@ -132,17 +132,24 @@
                                                 <constraint firstAttribute="height" constant="170" id="ogp-Hm-zo0"/>
                                             </constraints>
                                         </view>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D4C-I2-dhA">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalCompressionResistancePriority="749" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D4C-I2-dhA">
                                             <string key="text">Future glucose is predicted by combining the effects of multiple inputs. Use this tool to toggle various inputs to see how they compare to the final prediction.</string>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                             <nil key="highlightedColor"/>
                                         </label>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="eventually 92 mg/dL" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="E41-FN-nkk">
+                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                            <nil key="textColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
                                     </subviews>
                                     <constraints>
+                                        <constraint firstItem="FBL-RL-faM" firstAttribute="top" secondItem="E41-FN-nkk" secondAttribute="bottom" id="3PT-PF-Inl"/>
                                         <constraint firstItem="D4C-I2-dhA" firstAttribute="trailing" secondItem="B1i-Pw-wSw" secondAttribute="trailingMargin" id="9uK-3Y-h7v"/>
                                         <constraint firstItem="D4C-I2-dhA" firstAttribute="top" secondItem="FBL-RL-faM" secondAttribute="bottom" constant="8" symbolic="YES" id="BpV-SO-P1m"/>
                                         <constraint firstItem="FBL-RL-faM" firstAttribute="leading" secondItem="B1i-Pw-wSw" secondAttribute="leading" id="Fpe-8j-4tj"/>
-                                        <constraint firstItem="FBL-RL-faM" firstAttribute="top" secondItem="B1i-Pw-wSw" secondAttribute="top" id="ISt-Jb-QIw"/>
+                                        <constraint firstItem="E41-FN-nkk" firstAttribute="top" secondItem="B1i-Pw-wSw" secondAttribute="topMargin" id="OLE-SX-R27"/>
+                                        <constraint firstAttribute="trailingMargin" secondItem="E41-FN-nkk" secondAttribute="trailing" id="OpD-cV-eTS"/>
                                         <constraint firstAttribute="trailing" secondItem="FBL-RL-faM" secondAttribute="trailing" id="V7g-Yb-wIf"/>
                                         <constraint firstItem="D4C-I2-dhA" firstAttribute="leading" secondItem="B1i-Pw-wSw" secondAttribute="leadingMargin" id="pCh-6p-OJM"/>
                                         <constraint firstAttribute="bottomMargin" secondItem="D4C-I2-dhA" secondAttribute="bottom" priority="750" id="tnh-hw-dHu"/>
@@ -151,13 +158,14 @@
                                 <connections>
                                     <outlet property="chartContentView" destination="FBL-RL-faM" id="RH1-WM-FCr"/>
                                     <outlet property="subtitleLabel" destination="D4C-I2-dhA" id="HCL-Y3-Lcz"/>
+                                    <outlet property="titleLabel" destination="E41-FN-nkk" id="Zlv-SY-aDy"/>
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PredictionInputEffectTableViewCell" rowHeight="64" id="Xc2-a9-ojZ" customClass="PredictionInputEffectTableViewCell" customModule="Loop" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="312" width="375" height="64"/>
+                                <rect key="frame" x="0.0" y="362" width="320" height="64"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Xc2-a9-ojZ" id="a4h-tq-Rnl">
-                                    <frame key="frameInset" width="375" height="63.5"/>
+                                    <frame key="frameInset" width="320" height="63"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bIL-Ub-qYp">
@@ -186,10 +194,10 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" layoutMarginsFollowReadableWidth="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="SwitchTableViewCell" rowHeight="64" id="I71-cY-0y7" customClass="SwitchTableViewCell" customModule="Loop" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="376" width="375" height="64"/>
+                                <rect key="frame" x="0.0" y="426" width="320" height="64"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="I71-cY-0y7" id="0f9-ja-YFt">
-                                    <frame key="frameInset" width="375" height="63.5"/>
+                                    <frame key="frameInset" width="320" height="63"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="252" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zbc-87-wxZ">
@@ -257,11 +265,11 @@
             <objects>
                 <tableViewController id="1zR-tC-i50" customClass="StatusTableViewController" customModule="Loop" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="Rg0-f1-ZWM">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <view key="tableHeaderView" contentMode="scaleToFill" id="rhv-td-a2w">
-                            <rect key="frame" x="0.0" y="64" width="375" height="70"/>
+                            <rect key="frame" x="0.0" y="64" width="320" height="70"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
                                 <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="bJ9-Vd-YnA">
@@ -510,35 +518,54 @@
                             </constraints>
                         </view>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UITableViewCell" textLabel="LXC-eC-kw9" detailTextLabel="LjQ-f8-8VW" style="IBUITableViewCellStyleValue1" id="zTq-QB-XNu">
-                                <rect key="frame" x="0.0" y="162" width="375" height="44"/>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="TitleSubtitleTableViewCell" id="zTq-QB-XNu" customClass="TitleSubtitleTableViewCell" customModule="Loop" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="162" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="zTq-QB-XNu" id="vD6-31-qVz">
-                                    <frame key="frameInset" width="375" height="44"/>
+                                    <frame key="frameInset" width="320" height="44"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
-                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="LXC-eC-kw9">
-                                            <frame key="frameInset" minX="15" minY="13" width="31.5" height="19.5"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vSf-ph-T9I">
+                                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                        </view>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="3.5 U/hour @ 12:12 PM" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5gz-kZ-iF1">
+                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                            <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="LjQ-f8-8VW">
-                                            <frame key="frameInset" minX="318.5" minY="13" width="41.5" height="19.5"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Recommended Basal" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k3F-Na-7mn">
+                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                            <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
+                                    <constraints>
+                                        <constraint firstItem="k3F-Na-7mn" firstAttribute="leading" secondItem="vD6-31-qVz" secondAttribute="leadingMargin" id="1az-VR-KBn"/>
+                                        <constraint firstItem="5gz-kZ-iF1" firstAttribute="leading" secondItem="k3F-Na-7mn" secondAttribute="trailing" constant="8" symbolic="YES" id="57k-bf-8iD"/>
+                                        <constraint firstAttribute="bottomMargin" secondItem="5gz-kZ-iF1" secondAttribute="bottom" constant="5" id="DUA-M0-Crc"/>
+                                        <constraint firstAttribute="trailingMargin" secondItem="5gz-kZ-iF1" secondAttribute="trailing" id="Ght-Kf-Tta"/>
+                                        <constraint firstItem="5gz-kZ-iF1" firstAttribute="top" secondItem="vD6-31-qVz" secondAttribute="topMargin" constant="5" id="RVY-dw-wAk"/>
+                                        <constraint firstAttribute="bottomMargin" secondItem="k3F-Na-7mn" secondAttribute="bottom" constant="5" id="V21-Fv-rDF"/>
+                                        <constraint firstItem="k3F-Na-7mn" firstAttribute="top" secondItem="vD6-31-qVz" secondAttribute="topMargin" constant="5" id="ykM-Vi-LJ6"/>
+                                    </constraints>
                                 </tableViewCellContentView>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="vSf-ph-T9I" secondAttribute="trailing" id="4zZ-jT-3h5"/>
+                                    <constraint firstItem="vSf-ph-T9I" firstAttribute="top" secondItem="zTq-QB-XNu" secondAttribute="top" id="SjI-Yx-lDm"/>
+                                    <constraint firstAttribute="bottom" secondItem="vSf-ph-T9I" secondAttribute="bottom" id="TqR-yP-ca0"/>
+                                    <constraint firstItem="vSf-ph-T9I" firstAttribute="leading" secondItem="zTq-QB-XNu" secondAttribute="leading" id="VDj-cL-tYc"/>
+                                </constraints>
+                                <connections>
+                                    <outlet property="backgroundView" destination="vSf-ph-T9I" id="BFh-Fj-OMr"/>
+                                    <outlet property="subtitleLabel" destination="5gz-kZ-iF1" id="Ih8-Lb-7FQ"/>
+                                    <outlet property="titleLabel" destination="k3F-Na-7mn" id="Mrt-ZL-fKG"/>
+                                </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ChartTableViewCell" rowHeight="200" id="FEV-fX-i48" customClass="ChartTableViewCell" customModule="Loop" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="206" width="375" height="200"/>
+                                <rect key="frame" x="0.0" y="206" width="320" height="200"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FEV-fX-i48" id="lS6-Qa-Lw7">
-                                    <frame key="frameInset" width="375" height="200"/>
+                                    <frame key="frameInset" width="320" height="200"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Glucose" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tuw-av-A3x">
@@ -546,6 +573,11 @@
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="eventually 92 mg/dL" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rse-x8-amW">
+                                            <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                            <nil key="textColor"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ADL-hs-cfT" customClass="ChartContentView" customModule="Loop" customModuleProvider="target">
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                         </view>
@@ -554,14 +586,17 @@
                                         <constraint firstItem="ADL-hs-cfT" firstAttribute="leading" secondItem="lS6-Qa-Lw7" secondAttribute="leading" id="1ij-2X-KyF"/>
                                         <constraint firstItem="tuw-av-A3x" firstAttribute="top" secondItem="lS6-Qa-Lw7" secondAttribute="topMargin" id="44W-RH-eAs"/>
                                         <constraint firstItem="ADL-hs-cfT" firstAttribute="top" secondItem="tuw-av-A3x" secondAttribute="bottom" id="8SG-FW-fas"/>
+                                        <constraint firstAttribute="trailingMargin" secondItem="Rse-x8-amW" secondAttribute="trailing" id="czt-v0-TsI"/>
                                         <constraint firstAttribute="bottom" secondItem="ADL-hs-cfT" secondAttribute="bottom" id="fvX-sU-gU0"/>
                                         <constraint firstItem="tuw-av-A3x" firstAttribute="leading" secondItem="lS6-Qa-Lw7" secondAttribute="leadingMargin" id="guP-wu-vVB"/>
+                                        <constraint firstItem="Rse-x8-amW" firstAttribute="top" secondItem="lS6-Qa-Lw7" secondAttribute="topMargin" id="ivh-Mp-auR"/>
                                         <constraint firstAttribute="trailing" secondItem="ADL-hs-cfT" secondAttribute="trailing" id="lGX-Kb-VrF"/>
                                     </constraints>
                                 </tableViewCellContentView>
                                 <connections>
                                     <outlet property="chartContentView" destination="ADL-hs-cfT" id="RhA-6H-bW1"/>
-                                    <outlet property="subtitleLabel" destination="tuw-av-A3x" id="xEX-KU-fET"/>
+                                    <outlet property="subtitleLabel" destination="Rse-x8-amW" id="ud0-fJ-Pcw"/>
+                                    <outlet property="titleLabel" destination="tuw-av-A3x" id="clh-H1-JJe"/>
                                 </connections>
                             </tableViewCell>
                         </prototypes>
@@ -610,24 +645,24 @@
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="9Tc-kF-7yT" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="840" y="-457"/>
+            <point key="canvasLocation" x="838.125" y="-458.45070422535213"/>
         </scene>
         <!--Bolus-->
         <scene sceneID="MwC-nE-tVX">
             <objects>
                 <tableViewController id="WhH-Np-jCn" customClass="BolusViewController" customModule="Loop" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="s63-Nc-tNg">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <sections>
                             <tableViewSection id="7eu-Ys-7GW">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="DoN-m5-O7j">
-                                        <rect key="frame" x="0.0" y="99" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="99" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DoN-m5-O7j" id="3OB-7U-Jvb">
-                                            <frame key="frameInset" width="375" height="43.5"/>
+                                            <frame key="frameInset" width="320" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Recommended" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ywT-OR-NnU">
@@ -666,10 +701,10 @@
                                         </accessibility>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="us0-UE-Wqz">
-                                        <rect key="frame" x="0.0" y="143" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="143" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="us0-UE-Wqz" id="2fI-OE-GLU">
-                                            <frame key="frameInset" width="375" height="43.5"/>
+                                            <frame key="frameInset" width="320" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Bolus" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5oA-6d-ZTL">
@@ -707,10 +742,10 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="efV-tT-gC9">
-                                        <rect key="frame" x="0.0" y="187" width="375" height="44"/>
+                                        <rect key="frame" x="0.0" y="187" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="efV-tT-gC9" id="nq8-dv-ceA">
-                                            <frame key="frameInset" width="375" height="43.5"/>
+                                            <frame key="frameInset" width="320" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ya0-9b-ZAS">
@@ -766,7 +801,7 @@
                     </navigationBar>
                     <nil name="viewControllers"/>
                     <toolbar key="toolbar" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="tBa-QS-CwE">
-                        <rect key="frame" x="0.0" y="623" width="375" height="44"/>
+                        <rect key="frame" x="0.0" y="524" width="320" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </toolbar>
                     <connections>
diff --git a/Loop/Extensions/CollectionType.swift b/Loop/Extensions/CollectionType.swift
index c5af80b4aa..39359a1af4 100644
--- a/Loop/Extensions/CollectionType.swift
+++ b/Loop/Extensions/CollectionType.swift
@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import LoopKit
 
 
 extension BidirectionalCollection where Index: Strideable, Iterator.Element: Comparable, Index.Stride == Int {
@@ -70,3 +71,25 @@ extension BidirectionalCollection where Index: Strideable, Iterator.Element: Str
         return lowerBound
     }
 }
+
+
+public extension Sequence where Iterator.Element: TimelineValue {
+    /// Returns the closest element index in the sorted sequence prior to the specified date
+    ///
+    /// - parameter date: The date to use in the search
+    ///
+    /// - returns: The closest index, if any exist before the specified date
+    func closestIndexPriorToDate(_ date: Date) -> Int? {
+        var closestIndex: Int?
+
+        for (index, value) in self.enumerated() {
+            if value.startDate <= date {
+                closestIndex = index
+            } else {
+                break
+            }
+        }
+
+        return closestIndex
+    }
+}
diff --git a/Loop/Extensions/UIColor.swift b/Loop/Extensions/UIColor.swift
index 37fdce010a..c3637671d8 100644
--- a/Loop/Extensions/UIColor.swift
+++ b/Loop/Extensions/UIColor.swift
@@ -14,6 +14,8 @@ extension UIColor {
 
     @nonobjc static let secondaryLabelColor = UIColor.HIGGrayColor()
 
+    @nonobjc static let cellBackgroundColor = UIColor(white: 239 / 255, alpha: 1)
+
     @nonobjc static let gridColor = UIColor(white: 193 / 255, alpha: 1)
 
     @nonobjc static let glucoseTintColor = UIColor(red: 0 / 255, green: 176 / 255, blue: 255 / 255, alpha: 1)
diff --git a/Loop/Managers/StatusChartManager.swift b/Loop/Managers/StatusChartManager.swift
index 2255d47f31..846eb24afa 100644
--- a/Loop/Managers/StatusChartManager.swift
+++ b/Loop/Managers/StatusChartManager.swift
@@ -32,6 +32,11 @@ final class StatusChartsManager {
         return chartSettings
     }()
 
+    /// The amount of horizontal space reserved for fixed margins
+    var fixedHorizontalMargin: CGFloat {
+        return chartSettings.leading + chartSettings.trailing + (chartSettings.labelsWidthY ?? 0) + chartSettings.labelsToAxisSpacingY
+    }
+
     private lazy var dateFormatter: DateFormatter = {
         let timeFormatter = DateFormatter()
         timeFormatter.dateStyle = .none
@@ -40,7 +45,7 @@ final class StatusChartsManager {
         return timeFormatter
     }()
 
-    private lazy var decimalFormatter: NumberFormatter = {
+    private lazy var doseFormatter: NumberFormatter = {
         let numberFormatter = NumberFormatter()
         numberFormatter.numberStyle = .decimal
         numberFormatter.minimumFractionDigits = 2
@@ -125,23 +130,23 @@ final class StatusChartsManager {
         }
     }
 
-    var IOBValues: [InsulinValue] = [] {
+    var iobValues: [InsulinValue] = [] {
         didSet {
-            IOBPoints = IOBValues.map {
+            iobPoints = iobValues.map {
                 return ChartPoint(
                     x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
-                    y: ChartAxisValueDoubleUnit($0.value, unitString: "U", formatter: decimalFormatter)
+                    y: ChartAxisValueDoubleUnit($0.value, unitString: "U", formatter: doseFormatter)
                 )
             }
         }
     }
 
-    var COBValues: [CarbValue] = [] {
+    var cobValues: [CarbValue] = [] {
         didSet {
             let unit = HKUnit.gram()
             let unitString = unit.unitString
 
-            COBPoints = COBValues.map {
+            cobPoints = cobValues.map {
                 ChartPoint(
                     x: ChartAxisValueDate(date: $0.startDate, formatter: dateFormatter),
                     y: ChartAxisValueDoubleUnit($0.quantity.doubleValue(for: unit), unitString: unitString, formatter: integerFormatter)
@@ -152,12 +157,13 @@ final class StatusChartsManager {
 
     var doseEntries: [DoseEntry] = [] {
         didSet {
-            dosePoints = doseEntries.reduce([], { (points, entry) -> [ChartPoint] in
+            basalDosePoints = doseEntries.reduce([], { (points, entry) -> [ChartPoint] in
                 if entry.unit == .unitsPerHour {
+                    // TODO: Display the DateInterval
                     let startX = ChartAxisValueDate(date: entry.startDate, formatter: dateFormatter)
                     let endX = ChartAxisValueDate(date: entry.endDate, formatter: dateFormatter)
                     let zero = ChartAxisValueInt(0)
-                    let value = ChartAxisValueDoubleLog(actualDouble: entry.value, unitString: "U/hour", formatter: decimalFormatter)
+                    let value = ChartAxisValueDoubleLog(actualDouble: entry.value, unitString: "U/hour", formatter: doseFormatter)
 
                     let newPoints = [
                         ChartPoint(x: startX, y: zero),
@@ -189,14 +195,16 @@ final class StatusChartsManager {
         }
     }
 
-    private var predictedGlucosePoints: [ChartPoint] = [] {
+    /// The chart points for predicted glucose
+    var predictedGlucosePoints: [ChartPoint] = [] {
         didSet {
             glucoseChart = nil
             xAxisValues = nil
         }
     }
 
-    private var alternatePredictedGlucosePoints: [ChartPoint]?
+    /// The chart points for alternate predicted glucose
+    var alternatePredictedGlucosePoints: [ChartPoint]?
 
     private var targetGlucosePoints: [ChartPoint] = [] {
         didSet {
@@ -216,37 +224,39 @@ final class StatusChartsManager {
         }
     }
 
-    private var IOBPoints: [ChartPoint] = [] {
+    /// The chart points for IOB
+    var iobPoints: [ChartPoint] = [] {
         didSet {
-            IOBChart = nil
+            iobChart = nil
             xAxisValues = nil
         }
     }
 
     /// The minimum range to display for insulin values.
-    private let IOBDisplayRangePoints: [ChartPoint] = [0, 1].map {
+    private let iobDisplayRangePoints: [ChartPoint] = [0, 1].map {
         return ChartPoint(
             x: ChartAxisValue(scalar: 0),
             y: ChartAxisValueInt($0)
         )
     }
 
-    private var COBPoints: [ChartPoint] = [] {
+    /// The chart points for COB
+    var cobPoints: [ChartPoint] = [] {
         didSet {
-            COBChart = nil
+            cobChart = nil
             xAxisValues = nil
         }
     }
 
     /// The minimum range to display for COB values.
-    private var COBDisplayRangePoints: [ChartPoint] = [0, 10].map {
+    private var cobDisplayRangePoints: [ChartPoint] = [0, 10].map {
         return ChartPoint(
             x: ChartAxisValue(scalar: 0),
             y: ChartAxisValueInt($0)
         )
     }
 
-    private var dosePoints: [ChartPoint] = [] {
+    private var basalDosePoints: [ChartPoint] = [] {
         didSet {
             doseChart = nil
             xAxisValues = nil
@@ -267,17 +277,17 @@ final class StatusChartsManager {
 
     private var glucoseChart: Chart?
 
-    private var IOBChart: Chart?
+    private var iobChart: Chart?
 
-    private var COBChart: Chart?
+    private var cobChart: Chart?
 
     private var doseChart: Chart?
 
     private var glucoseChartCache: ChartPointsTouchHighlightLayerViewCache?
 
-    private var IOBChartCache: ChartPointsTouchHighlightLayerViewCache?
+    private var iobChartCache: ChartPointsTouchHighlightLayerViewCache?
 
-    private var COBChartCache: ChartPointsTouchHighlightLayerViewCache?
+    private var cobChartCache: ChartPointsTouchHighlightLayerViewCache?
 
     private var doseChartCache: ChartPointsTouchHighlightLayerViewCache?
 
@@ -400,16 +410,16 @@ final class StatusChartsManager {
         return Chart(frame: frame, layers: layers.flatMap { $0 })
     }
 
-    func IOBChartWithFrame(_ frame: CGRect) -> Chart? {
-        if let chart = IOBChart, chart.frame != frame {
-            self.IOBChart = nil
+    func iobChartWithFrame(_ frame: CGRect) -> Chart? {
+        if let chart = iobChart, chart.frame != frame {
+            self.iobChart = nil
         }
 
-        if IOBChart == nil {
-            IOBChart = generateIOBChartWithFrame(frame)
+        if iobChart == nil {
+            iobChart = generateIOBChartWithFrame(frame)
         }
 
-        return IOBChart
+        return iobChart
     }
 
     private func generateIOBChartWithFrame(_ frame: CGRect) -> Chart? {
@@ -417,18 +427,18 @@ final class StatusChartsManager {
             return nil
         }
 
-        var containerPoints = IOBPoints
+        var containerPoints = iobPoints
 
         // Create a container line at 0
-        if let first = IOBPoints.first {
+        if let first = iobPoints.first {
             containerPoints.insert(ChartPoint(x: first.x, y: ChartAxisValueInt(0)), at: 0)
         }
 
-        if let last = IOBPoints.last {
+        if let last = iobPoints.last {
             containerPoints.append(ChartPoint(x: last.x, y: ChartAxisValueInt(0)))
         }
 
-        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(IOBPoints + IOBDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: 0.5, axisValueGenerator: { ChartAxisValueDouble($0, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: false)
+        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(iobPoints + iobDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: 0.5, axisValueGenerator: { ChartAxisValueDouble($0, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: false)
 
         let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: axisLineColor)
 
@@ -437,8 +447,8 @@ final class StatusChartsManager {
         let (xAxis, yAxis, innerFrame) = (coordsSpace.xAxis, coordsSpace.yAxis, coordsSpace.chartInnerFrame)
 
         // The IOB area
-        let lineModel = ChartLineModel(chartPoints: IOBPoints, lineColor: UIColor.IOBTintColor, lineWidth: 2, animDuration: 0, animDelay: 0)
-        let IOBLine = ChartPointsLineLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, lineModels: [lineModel])
+        let lineModel = ChartLineModel(chartPoints: iobPoints, lineColor: UIColor.IOBTintColor, lineWidth: 2, animDuration: 0, animDelay: 0)
+        let iobLine = ChartPointsLineLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, lineModels: [lineModel])
 
         let iobArea: ChartPointsAreaLayer<ChartPoint>?
 
@@ -462,11 +472,11 @@ final class StatusChartsManager {
             return v
         })
 
-        IOBChartCache = ChartPointsTouchHighlightLayerViewCache(
+        iobChartCache = ChartPointsTouchHighlightLayerViewCache(
             xAxis: xAxis,
             yAxis: yAxis,
             innerFrame: innerFrame,
-            chartPoints: IOBPoints,
+            chartPoints: iobPoints,
             tintColor: UIColor.IOBTintColor,
             labelCenterY: chartSettings.top,
             gestureRecognizer: panGestureRecognizer
@@ -477,24 +487,24 @@ final class StatusChartsManager {
             xAxis,
             yAxis,
             zeroGuidelineLayer,
-            IOBChartCache?.highlightLayer,
+            iobChartCache?.highlightLayer,
             iobArea,
-            IOBLine,
+            iobLine,
         ]
 
         return Chart(frame: frame, layers: layers.flatMap { $0 })
     }
 
-    func COBChartWithFrame(_ frame: CGRect) -> Chart? {
-        if let chart = COBChart, chart.frame != frame {
-            self.COBChart = nil
+    func cobChartWithFrame(_ frame: CGRect) -> Chart? {
+        if let chart = cobChart, chart.frame != frame {
+            self.cobChart = nil
         }
 
-        if COBChart == nil {
-            COBChart = generateCOBChartWithFrame(frame)
+        if cobChart == nil {
+            cobChart = generateCOBChartWithFrame(frame)
         }
 
-        return COBChart
+        return cobChart
     }
 
     private func generateCOBChartWithFrame(_ frame: CGRect) -> Chart? {
@@ -502,18 +512,18 @@ final class StatusChartsManager {
             return nil
         }
 
-        var containerPoints = COBPoints
+        var containerPoints = cobPoints
 
         // Create a container line at 0
-        if let first = COBPoints.first {
+        if let first = cobPoints.first {
             containerPoints.insert(ChartPoint(x: first.x, y: ChartAxisValueInt(0)), at: 0)
         }
 
-        if let last = COBPoints.last {
+        if let last = cobPoints.last {
             containerPoints.append(ChartPoint(x: last.x, y: ChartAxisValueInt(0)))
         }
 
-        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(COBPoints + COBDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: 10, axisValueGenerator: { ChartAxisValueDouble($0, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: false)
+        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(cobPoints + cobDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: 10, axisValueGenerator: { ChartAxisValueDouble($0, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: false)
 
         let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: axisLineColor)
 
@@ -522,8 +532,8 @@ final class StatusChartsManager {
         let (xAxis, yAxis, innerFrame) = (coordsSpace.xAxis, coordsSpace.yAxis, coordsSpace.chartInnerFrame)
 
         // The COB area
-        let lineModel = ChartLineModel(chartPoints: COBPoints, lineColor: UIColor.COBTintColor, lineWidth: 2, animDuration: 0, animDelay: 0)
-        let COBLine = ChartPointsLineLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, lineModels: [lineModel])
+        let lineModel = ChartLineModel(chartPoints: cobPoints, lineColor: UIColor.COBTintColor, lineWidth: 2, animDuration: 0, animDelay: 0)
+        let cobLine = ChartPointsLineLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, lineModels: [lineModel])
 
         let cobArea: ChartPointsAreaLayer<ChartPoint>?
 
@@ -537,11 +547,11 @@ final class StatusChartsManager {
         let gridLayer = ChartGuideLinesLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, axis: .xAndY, settings: guideLinesLayerSettings, onlyVisibleX: true, onlyVisibleY: false)
 
 
-        COBChartCache = ChartPointsTouchHighlightLayerViewCache(
+        cobChartCache = ChartPointsTouchHighlightLayerViewCache(
             xAxis: xAxis,
             yAxis: yAxis,
             innerFrame: innerFrame,
-            chartPoints: COBPoints,
+            chartPoints: cobPoints,
             tintColor: UIColor.COBTintColor,
             labelCenterY: chartSettings.top,
             gestureRecognizer: panGestureRecognizer
@@ -551,9 +561,9 @@ final class StatusChartsManager {
             gridLayer,
             xAxis,
             yAxis,
-            COBChartCache?.highlightLayer,
+            cobChartCache?.highlightLayer,
             cobArea,
-            COBLine
+            cobLine
         ]
 
         return Chart(frame: frame, layers: layers.flatMap { $0 })
@@ -576,7 +586,7 @@ final class StatusChartsManager {
             return nil
         }
 
-        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(dosePoints + IOBDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: log10(2) / 2, axisValueGenerator: { ChartAxisValueDoubleLog(screenLocDouble: $0, formatter: self.integerFormatter, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: true)
+        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(basalDosePoints + iobDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: log10(2) / 2, axisValueGenerator: { ChartAxisValueDoubleLog(screenLocDouble: $0, formatter: self.integerFormatter, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: true)
 
         let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: axisLineColor)
 
@@ -585,13 +595,13 @@ final class StatusChartsManager {
         let (xAxis, yAxis, innerFrame) = (coordsSpace.xAxis, coordsSpace.yAxis, coordsSpace.chartInnerFrame)
 
         // The dose area
-        let lineModel = ChartLineModel(chartPoints: dosePoints, lineColor: UIColor.doseTintColor, lineWidth: 2, animDuration: 0, animDelay: 0)
+        let lineModel = ChartLineModel(chartPoints: basalDosePoints, lineColor: UIColor.doseTintColor, lineWidth: 2, animDuration: 0, animDelay: 0)
         let doseLine = ChartPointsLineLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, lineModels: [lineModel])
 
         let doseArea: ChartPointsAreaLayer<ChartPoint>?
 
-        if dosePoints.count > 1 {
-            doseArea = ChartPointsAreaLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: dosePoints, areaColor: UIColor.doseTintColor.withAlphaComponent(0.5), animDuration: 0, animDelay: 0, addContainerPoints: false)
+        if basalDosePoints.count > 1 {
+            doseArea = ChartPointsAreaLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: basalDosePoints, areaColor: UIColor.doseTintColor.withAlphaComponent(0.5), animDuration: 0, animDelay: 0, addContainerPoints: false)
         } else {
             doseArea = nil
         }
@@ -614,7 +624,7 @@ final class StatusChartsManager {
             xAxis: xAxis,
             yAxis: yAxis,
             innerFrame: innerFrame,
-            chartPoints: dosePoints.filter { $0.y.scalar != 0 },
+            chartPoints: basalDosePoints.filter { $0.y.scalar != 0 },
             tintColor: UIColor.doseTintColor,
             labelCenterY: chartSettings.top,
             gestureRecognizer: panGestureRecognizer
@@ -634,19 +644,26 @@ final class StatusChartsManager {
     }
 
     private func generateXAxisValues() {
-        let points = glucosePoints + predictedGlucosePoints + IOBPoints + COBPoints + dosePoints
+        let timeFormatter = DateFormatter()
+        timeFormatter.dateFormat = "h a"
+
+        let points = [
+            ChartPoint(x: ChartAxisValueDate(date: startDate, formatter: timeFormatter), y: ChartAxisValue(scalar: 0)),
+            ChartPoint(x: ChartAxisValueDate(date: startDate.addingTimeInterval(TimeInterval(hours: 4)), formatter: timeFormatter), y: ChartAxisValue(scalar: 0)),
+            glucosePoints.last,
+            predictedGlucosePoints.last,
+            iobPoints.last,
+            cobPoints.last,
+            basalDosePoints.last
+        ].flatMap { $0 }
 
         guard points.count > 1 else {
             self.xAxisValues = []
             return
         }
 
-        let timeFormatter = DateFormatter()
-        timeFormatter.dateFormat = "h a"
-
-        let minDate = startDate
-        let xAxisValues = ChartAxisValuesGenerator.generateXAxisValuesWithChartPoints(points, minSegmentCount: 5, maxSegmentCount: 10, multiple: TimeInterval(hours: 1), axisValueGenerator: {
-            ChartAxisValueDate(date: max(minDate, ChartAxisValueDate.dateFromScalar($0)), formatter: timeFormatter, labelSettings: self.axisLabelSettings)
+        let xAxisValues = ChartAxisValuesGenerator.generateXAxisValuesWithChartPoints(points, minSegmentCount: 4, maxSegmentCount: 10, multiple: TimeInterval(hours: 1), axisValueGenerator: {
+            ChartAxisValueDate(date: ChartAxisValueDate.dateFromScalar($0), formatter: timeFormatter, labelSettings: self.axisLabelSettings)
         }, addPaddingSegmentIfEdge: false)
         xAxisValues.first?.hidden = true
         xAxisValues.last?.hidden = true
@@ -656,8 +673,8 @@ final class StatusChartsManager {
 
     func prerender() {
         glucoseChart = nil
-        IOBChart = nil
-        COBChart = nil
+        iobChart = nil
+        cobChart = nil
 
         generateXAxisValues()
 
diff --git a/Loop/View Controllers/PredictionTableViewController.swift b/Loop/View Controllers/PredictionTableViewController.swift
index 0210c857f2..a5a0568d3d 100644
--- a/Loop/View Controllers/PredictionTableViewController.swift	
+++ b/Loop/View Controllers/PredictionTableViewController.swift	
@@ -11,7 +11,7 @@ import HealthKit
 import LoopKit
 
 
-class PredictionTableViewController: UITableViewController, IdentifiableClass {
+class PredictionTableViewController: UITableViewController, IdentifiableClass, UIGestureRecognizerDelegate {
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -40,6 +40,11 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass {
                 self.active = true
             }
         ]
+
+        let chartPanGestureRecognizer = UIPanGestureRecognizer()
+        chartPanGestureRecognizer.delegate = self
+        chartPanGestureRecognizer.addTarget(self, action: #selector(handlePan(_:)))
+        charts.panGestureRecognizer = chartPanGestureRecognizer
     }
 
     deinit {
@@ -123,64 +128,70 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass {
             charts.startDate = calendar.nextDate(after: date, matching: components, matchingPolicy: .strict, direction: .backward) ?? date
 
             let reloadGroup = DispatchGroup()
-            var glucoseUnit: HKUnit?
 
             if let glucoseStore = dataManager.glucoseStore {
                 reloadGroup.enter()
-                glucoseStore.getRecentGlucoseValues(startDate: charts.startDate) { (values, error) -> Void in
-                    if let error = error {
-                        self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
-                        self.needsRefresh = true
-                        // TODO: Display error in the cell
-                    } else {
-                        self.charts.glucoseValues = values
-                    }
-
-                    reloadGroup.leave()
-                }
 
-                reloadGroup.enter()
                 glucoseStore.preferredUnit { (unit, error) in
-                    glucoseUnit = unit
+                    if let unit = unit {
+                        self.charts.glucoseUnit = unit
+                    }
 
-                    reloadGroup.leave()
-                }
-            }
+                    reloadGroup.enter()
+                    glucoseStore.getRecentGlucoseValues(startDate: self.charts.startDate) { (values, error) -> Void in
+                        if let error = error {
+                            self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
+                            self.needsRefresh = true
+                            // TODO: Display error in the cell
+                        } else {
+                            self.charts.glucoseValues = values
+                        }
+
+                        reloadGroup.leave()
+                    }
 
-            reloadGroup.enter()
-            dataManager.loopManager.getLoopStatus { (predictedGlucose, retrospectivePredictedGlucose, _, _, _, _, error) in
-                if error != nil {
-                    self.needsRefresh = true
-                }
+                    reloadGroup.enter()
+                    self.dataManager.loopManager.getLoopStatus { (predictedGlucose, retrospectivePredictedGlucose, _, _, _, _, error) in
+                        if error != nil {
+                            self.needsRefresh = true
+                        }
 
-                self.retrospectivePredictedGlucose = retrospectivePredictedGlucose
-                self.charts.predictedGlucoseValues = predictedGlucose ?? []
+                        self.retrospectivePredictedGlucose = retrospectivePredictedGlucose
+                        self.charts.predictedGlucoseValues = predictedGlucose ?? []
+                        
+                        reloadGroup.leave()
+                    }
 
-                reloadGroup.leave()
-            }
+                    reloadGroup.enter()
+                    self.dataManager.loopManager.modelPredictedGlucose(using: self.selectedInputs.flatMap { $0.selected ? $0.input : nil }) { (predictedGlucose, error) in
+                        if error != nil {
+                            self.needsRefresh = true
+                        }
 
-            reloadGroup.enter()
-            dataManager.loopManager.modelPredictedGlucose(using: selectedInputs.flatMap { $0.selected ? $0.input : nil }) { (predictedGlucose, error) in
-                if error != nil {
-                    self.needsRefresh = true
-                }
+                        self.charts.alternatePredictedGlucoseValues = predictedGlucose ?? []
 
-                self.charts.alternatePredictedGlucoseValues = predictedGlucose ?? []
+                        if let lastPoint = self.charts.alternatePredictedGlucosePoints?.last?.y {
+                            self.eventualGlucoseDescription = String(describing: lastPoint)
+                        }
 
-                reloadGroup.leave()
+                        reloadGroup.leave()
+                    }
+
+                    reloadGroup.leave()
+                }
             }
 
             charts.glucoseTargetRangeSchedule = dataManager.glucoseTargetRangeSchedule
 
             reloadGroup.notify(queue: DispatchQueue.main) {
-                if let unit = glucoseUnit {
-                    self.charts.glucoseUnit = unit
-                }
-                
                 self.charts.prerender()
 
-                for case let row as ChartTableViewCell in self.tableView.visibleCells {
-                    row.reloadChart()
+                for case let cell as ChartTableViewCell in self.tableView.visibleCells {
+                    cell.reloadChart()
+
+                    if let indexPath = self.tableView.indexPath(for: cell) {
+                        self.tableView(self.tableView, updateTitleFor: cell, at: indexPath)
+                    }
                 }
 
                 self.reloading = false
@@ -198,6 +209,8 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass {
         static let count = 3
     }
 
+    private var eventualGlucoseDescription: String?
+
     private lazy var selectedInputs: [(input: PredictionInputEffect, selected: Bool)] = [
         (.carbs, true), (.insulin, true), (.momentum, true), (.retrospection, true)
     ]
@@ -221,14 +234,19 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass {
         switch Section(rawValue: indexPath.section)! {
         case .charts:
             let cell = tableView.dequeueReusableCell(withIdentifier: ChartTableViewCell.className, for: indexPath) as! ChartTableViewCell
-            cell.textLabel?.textColor = UIColor.secondaryLabelColor
+            cell.titleLabel?.textColor = UIColor.secondaryLabelColor
+            cell.subtitleLabel?.textColor = UIColor.secondaryLabelColor
             cell.contentView.layoutMargins.left = tableView.separatorInset.left
-            cell.chartContentView.chartGenerator = { [unowned self] (frame) in
-                return self.charts.glucoseChartWithFrame(frame)?.view
+            cell.chartContentView.chartGenerator = { [weak self] (frame) in
+                return self?.charts.glucoseChartWithFrame(frame)?.view
             }
 
+            self.tableView(tableView, updateTitleFor: cell, at: indexPath)
+            cell.titleLabel?.textColor = UIColor.secondaryLabelColor
             cell.selectionStyle = .none
 
+            cell.addGestureRecognizer(charts.panGestureRecognizer!)
+
             return cell
         case .inputs:
             let cell = tableView.dequeueReusableCell(withIdentifier: PredictionInputEffectTableViewCell.className, for: indexPath) as! PredictionInputEffectTableViewCell
@@ -276,6 +294,19 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass {
         }
     }
 
+    private func tableView(_ tableView: UITableView, updateTitleFor cell: ChartTableViewCell, at indexPath: IndexPath) {
+        switch Section(rawValue: indexPath.section)! {
+        case .charts:
+            if let eventualGlucose = eventualGlucoseDescription {
+                cell.titleLabel?.text = String(format: NSLocalizedString("Eventually %@", comment: "The subtitle format describing eventual glucose. (1: localized glucose value description)"), eventualGlucose)
+            } else {
+                cell.titleLabel?.text = nil
+            }
+        default:
+            break
+        }
+    }
+
     override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         switch Section(rawValue: section)! {
         case .settings:
@@ -290,7 +321,7 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass {
     override func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
         switch Section(rawValue: indexPath.section)! {
         case .charts:
-            return 220
+            return 270
         case .inputs, .settings:
             return 60
         }
@@ -313,6 +344,28 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass {
         reloadData()
     }
 
+    // MARK: - UIGestureRecognizer
+
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        return true
+    }
+
+    @objc func handlePan(_ gestureRecognizer: UIGestureRecognizer) {
+        switch gestureRecognizer.state {
+        case .possible, .changed:
+            // Follow your dreams!
+            break
+        case .began, .cancelled, .ended, .failed:
+            for case let row as ChartTableViewCell in self.tableView.visibleCells {
+                let forwards = gestureRecognizer.state == .began
+                UIView.animate(withDuration: forwards ? 0.2 : 0.5, delay: forwards ? 0 : 1, animations: {
+                    let alpha: CGFloat = forwards ? 0 : 1
+                    row.titleLabel?.alpha = alpha
+                })
+            }
+        }
+    }
+
     // MARK: - Actions
 
     @objc private func retrospectiveCorrectionSwitchChanged(_ sender: UISwitch) {
diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift
index f75085e46c..b340c4e89a 100644
--- a/Loop/View Controllers/StatusTableViewController.swift	
+++ b/Loop/View Controllers/StatusTableViewController.swift	
@@ -53,6 +53,7 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
         let chartPanGestureRecognizer = UIPanGestureRecognizer()
         chartPanGestureRecognizer.delegate = self
+        chartPanGestureRecognizer.addTarget(self, action: #selector(handlePan(_:)))
         tableView.addGestureRecognizer(chartPanGestureRecognizer)
         charts.panGestureRecognizer = chartPanGestureRecognizer
 
@@ -98,7 +99,7 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
         needsRefresh = true
         if visible {
-            reloadData(animated: false)
+            reloadData(animated: false, to: size)
         }
     }
 
@@ -129,85 +130,107 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
     /// Refetches all data and updates the views. Must be called on the main queue.
     ///
     /// - parameter animated: Whether the updating should be animated if possible
-    private func reloadData(animated: Bool = false) {
+    private func reloadData(animated: Bool = false, to size: CGSize? = nil) {
         if active && visible && needsRefresh {
             needsRefresh = false
             reloading = true
 
-            let calendar = Calendar.current
+            // How far back should we show data? Use the screen size as a guid.
+            let minimumSegmentWidth: CGFloat = 50
+            let availableWidth = (size ?? self.tableView.bounds.size).width - self.charts.fixedHorizontalMargin
+            let totalHours = floor(Double(availableWidth / minimumSegmentWidth))
+            let historyHours = totalHours - (dataManager.insulinActionDuration ?? TimeInterval(hours: 4)).hours
+
             var components = DateComponents()
             components.minute = 0
-            let date = Date(timeIntervalSinceNow: -TimeInterval(hours: 6))
-            charts.startDate = calendar.nextDate(after: date, matching: components, matchingPolicy: .strict, direction: .backward) ?? date
+            let date = Date(timeIntervalSinceNow: -TimeInterval(hours: max(1, historyHours)))
+            charts.startDate = Calendar.current.nextDate(after: date, matching: components, matchingPolicy: .strict, direction: .backward) ?? date
             charts.glucoseDisplayRange = (
                 min: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 100),
                 max: HKQuantity(unit: HKUnit.milligramsPerDeciliterUnit(), doubleValue: 175)
             )
 
             let reloadGroup = DispatchGroup()
-            var glucoseUnit: HKUnit?
             let oldRecommendedTempBasal = self.recommendedTempBasal
             var newRecommendedTempBasal: LoopDataManager.TempBasalRecommendation?
 
             if let glucoseStore = dataManager.glucoseStore {
                 reloadGroup.enter()
-                glucoseStore.getRecentGlucoseValues(startDate: charts.startDate) { (values, error) -> Void in
-                    if let error = error {
-                        self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
-                        self.needsRefresh = true
-                        // TODO: Display error in the cell
-                    } else {
-                        self.charts.glucoseValues = values
+                glucoseStore.preferredUnit { (unit, error) in
+                    if let unit = unit {
+                        self.charts.glucoseUnit = unit
                     }
 
-                    reloadGroup.leave()
-                }
+                    reloadGroup.enter()
+                    glucoseStore.getRecentGlucoseValues(startDate: self.charts.startDate) { (values, error) -> Void in
+                        if let error = error {
+                            self.dataManager.logger.addError(error, fromSource: "GlucoseStore")
+                            self.needsRefresh = true
+                        } else {
+                            self.charts.glucoseValues = values
+                        }
 
-                reloadGroup.enter()
-                glucoseStore.preferredUnit { (unit, error) in
-                    glucoseUnit = unit
+                        reloadGroup.leave()
+                    }
+
+                    reloadGroup.enter()
+                    self.dataManager.loopManager.getLoopStatus { (predictedGlucose, _, recommendedTempBasal, lastTempBasal, lastLoopCompleted, _, error) -> Void in
+                        if error != nil {
+                            self.needsRefresh = true
+                        }
+
+                        self.charts.predictedGlucoseValues = predictedGlucose ?? []
+                        newRecommendedTempBasal = recommendedTempBasal
+                        self.lastTempBasal = lastTempBasal
+                        self.lastLoopCompleted = lastLoopCompleted
+
+                        if let lastPoint = self.charts.predictedGlucosePoints.last?.y {
+                            self.eventualGlucoseDescription = String(describing: lastPoint)
+                        }
+
+                        reloadGroup.leave()
+                    }
 
                     reloadGroup.leave()
                 }
             }
 
             reloadGroup.enter()
-            dataManager.loopManager.getLoopStatus { (predictedGlucose, _, recommendedTempBasal, lastTempBasal, lastLoopCompleted, _, error) -> Void in
-                if error != nil {
+            dataManager.doseStore.getInsulinOnBoardValues(startDate: charts.startDate) { (values, error) -> Void in
+                if let error = error {
+                    self.dataManager.logger.addError(error, fromSource: "DoseStore")
                     self.needsRefresh = true
                 }
 
-                self.charts.predictedGlucoseValues = predictedGlucose ?? []
-                newRecommendedTempBasal = recommendedTempBasal
-                self.lastTempBasal = lastTempBasal
-                self.lastLoopCompleted = lastLoopCompleted
+                self.charts.iobValues = values
+
+                if let index = values.closestIndexPriorToDate(Date()) {
+                    self.currentIOBDescription = String(describing: self.charts.iobPoints[index].y)
+                }
 
                 reloadGroup.leave()
             }
 
             reloadGroup.enter()
-            dataManager.doseStore.getInsulinOnBoardValues(startDate: charts.startDate) { (values, error) -> Void in
+            dataManager.doseStore.getRecentNormalizedDoseEntries(startDate: charts.startDate) { (doses, error) -> Void in
                 if let error = error {
                     self.dataManager.logger.addError(error, fromSource: "DoseStore")
                     self.needsRefresh = true
-                    // TODO: Display error in the cell
                 }
 
-                self.charts.IOBValues = values
+                self.charts.doseEntries = doses
 
                 reloadGroup.leave()
             }
 
             reloadGroup.enter()
-            dataManager.doseStore.getRecentNormalizedDoseEntries(startDate: charts.startDate) { (doses, error) -> Void in
-                if let error = error {
-                    self.dataManager.logger.addError(error, fromSource: "DoseStore")
+            dataManager.doseStore.getTotalRecentUnitsDelivered { (units, _, error) in
+                if error != nil {
                     self.needsRefresh = true
-                    // TODO: Display error in the cell
+                } else {
+                    self.totalDelivery = units
                 }
 
-                self.charts.doseEntries = doses
-
                 reloadGroup.leave()
             }
 
@@ -217,10 +240,13 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
                     if let error = error {
                         self.dataManager.logger.addError(error, fromSource: "CarbStore")
                         self.needsRefresh = true
-                        // TODO: Display error in the cell
                     }
 
-                    self.charts.COBValues = values
+                    self.charts.cobValues = values
+
+                    if let index = values.closestIndexPriorToDate(Date()) {
+                        self.currentCOBDescription = String(describing: self.charts.cobPoints[index].y)
+                    }
 
                     reloadGroup.leave()
                 }
@@ -245,10 +271,8 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
             workoutMode = dataManager.workoutModeEnabled
 
             reloadGroup.notify(queue: DispatchQueue.main) {
-                if let unit = glucoseUnit, let glucose = self.dataManager.glucoseStore?.latestGlucose {
-                    self.charts.glucoseUnit = unit
-
-                    self.glucoseHUD.set(glucose, for: unit, from: self.dataManager.sensorInfo)
+                if let glucose = self.dataManager.glucoseStore?.latestGlucose {
+                    self.glucoseHUD.set(glucose, for: self.charts.glucoseUnit, from: self.dataManager.sensorInfo)
                 }
 
                 self.charts.prerender()
@@ -266,8 +290,12 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
                     break
                 }
 
-                for case let row as ChartTableViewCell in self.tableView.visibleCells {
-                    row.reloadChart()
+                for case let cell as ChartTableViewCell in self.tableView.visibleCells {
+                    cell.reloadChart()
+
+                    if let indexPath = self.tableView.indexPath(for: cell) {
+                        self.tableView(self.tableView, updateSubtitleFor: cell, at: indexPath)
+                    }
                 }
 
                 self.reloading = false
@@ -295,6 +323,29 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
     private let charts = StatusChartsManager()
 
+    // MARK: Glucose
+
+    private var eventualGlucoseDescription: String?
+
+    // MARK: IOB
+
+    private var currentIOBDescription: String?
+
+    // MARK: Dose
+
+    private var totalDelivery: Double?
+
+    private lazy var integerFormatter: NumberFormatter = {
+        let formatter = NumberFormatter()
+        formatter.maximumFractionDigits = 0
+
+        return formatter
+    }()
+
+    // MARK: COB
+
+    private var currentCOBDescription: String?
+
     // MARK: - Loop Status Section Data
 
     private enum StatusRow: Int {
@@ -305,6 +356,30 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
     private var recommendedTempBasal: LoopDataManager.TempBasalRecommendation?
 
+    private var settingTempBasal: Bool = false {
+        didSet {
+            if let cell = tableView.cellForRow(at: IndexPath(row: StatusRow.recommendedBasal.rawValue, section: Section.status.rawValue)) {
+                if settingTempBasal {
+                    let indicatorView = UIActivityIndicatorView(activityIndicatorStyle: .gray)
+                    indicatorView.startAnimating()
+                    cell.accessoryView = indicatorView
+                } else {
+                    cell.accessoryView = nil
+                }
+            }
+        }
+    }
+
+    private lazy var timeFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.dateStyle = .none
+        formatter.timeStyle = .short
+
+        return formatter
+    }()
+
+    // MARK: - HUD Data
+
     private var lastTempBasal: DoseEntry? {
         didSet {
             guard let scheduledBasal = dataManager.basalRateSchedule?.between(start: Date(), end: Date()).first else {
@@ -349,19 +424,7 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         }
     }
 
-    private var settingTempBasal: Bool = false {
-        didSet {
-            if let cell = tableView.cellForRow(at: IndexPath(row: StatusRow.recommendedBasal.rawValue, section: Section.status.rawValue)) {
-                if settingTempBasal {
-                    let indicatorView = UIActivityIndicatorView(activityIndicatorStyle: .gray)
-                    indicatorView.startAnimating()
-                    cell.accessoryView = indicatorView
-                } else {
-                    cell.accessoryView = nil
-                }
-            }
-        }
-    }
+    // MARK: - Toolbar data
 
     private var workoutMode: Bool? = nil {
         didSet {
@@ -377,20 +440,6 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         }
     }
 
-    // MARK: - Pump/Sensor Section Data
-
-    private lazy var emptyValueString: String = NSLocalizedString("––",
-        comment: "The detail value of a numeric cell with no value"
-    )
-
-    private lazy var timeFormatter: DateFormatter = {
-        let formatter = DateFormatter()
-        formatter.dateStyle = .none
-        formatter.timeStyle = .short
-
-        return formatter
-    }()
-
     // MARK: - Table view data source
 
     override func numberOfSections(in tableView: UITableView) -> Int {
@@ -407,9 +456,6 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
     }
 
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-
-        let locale = Locale.current
-
         switch Section(rawValue: indexPath.section)! {
         case .charts:
             let cell = tableView.dequeueReusableCell(withIdentifier: ChartTableViewCell.className, for: indexPath) as! ChartTableViewCell
@@ -419,38 +465,44 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
                 cell.chartContentView.chartGenerator = { [unowned self] (frame) in
                     return self.charts.glucoseChartWithFrame(frame)?.view
                 }
-                cell.subtitleLabel?.text = NSLocalizedString("Glucose", comment: "The title of the glucose and prediction graph")
+                cell.titleLabel?.text = NSLocalizedString("Glucose", comment: "The title of the glucose and prediction graph")
             case .iob:
                 cell.chartContentView.chartGenerator = { [unowned self] (frame) in
-                    return self.charts.IOBChartWithFrame(frame)?.view
+                    return self.charts.iobChartWithFrame(frame)?.view
                 }
-                cell.subtitleLabel?.text = NSLocalizedString("Active Insulin", comment: "The title of the Insulin On-Board graph")
+                cell.titleLabel?.text = NSLocalizedString("Active Insulin", comment: "The title of the Insulin On-Board graph")
             case .dose:
                 cell.chartContentView?.chartGenerator = { [unowned self] (frame) in
                     return self.charts.doseChartWithFrame(frame)?.view
                 }
-                cell.subtitleLabel?.text = NSLocalizedString("Insulin Delivery", comment: "The title of the insulin delivery graph")
+                cell.titleLabel?.text = NSLocalizedString("Insulin Delivery", comment: "The title of the insulin delivery graph")
             case .cob:
                 cell.chartContentView?.chartGenerator = { [unowned self] (frame) in
-                    return self.charts.COBChartWithFrame(frame)?.view
+                    return self.charts.cobChartWithFrame(frame)?.view
                 }
-                cell.subtitleLabel?.text = NSLocalizedString("Active Carbohydrates", comment: "The title of the Carbs On-Board graph")
+                cell.titleLabel?.text = NSLocalizedString("Active Carbohydrates", comment: "The title of the Carbs On-Board graph")
             }
 
+            self.tableView(tableView, updateSubtitleFor: cell, at: indexPath)
+
+            let alpha: CGFloat = charts.panGestureRecognizer?.state == .possible ? 1 : 0
+            cell.titleLabel?.alpha = alpha
+            cell.subtitleLabel?.alpha = alpha
+
+            cell.subtitleLabel?.textColor = UIColor.secondaryLabelColor
+
             return cell
         case .status:
-            let cell = tableView.dequeueReusableCell(withIdentifier: UITableViewCell.className, for: indexPath)
+            let cell = tableView.dequeueReusableCell(withIdentifier: TitleSubtitleTableViewCell.className, for: indexPath) as! TitleSubtitleTableViewCell
             cell.selectionStyle = .none
 
             switch StatusRow(rawValue: indexPath.row)! {
             case .recommendedBasal:
-                cell.textLabel?.text = NSLocalizedString("Recommended Basal", comment: "The title of the cell containing the recommended basal")
-
                 if let recommendedTempBasal = recommendedTempBasal {
-                    cell.detailTextLabel?.text = "\(NSNumber(value: recommendedTempBasal.rate as Double).description(withLocale: locale)) U/hour @ \(timeFormatter.string(from: recommendedTempBasal.recommendedDate))"
+                    cell.subtitleLabel?.text = String(format: NSLocalizedString("%1$@ U/hour @ %2$@", comment: "The format for recommended temp basal rate and time. (1: localized rate number)(2: localized time)"), NumberFormatter.localizedString(from: NSNumber(value: recommendedTempBasal.rate), number: .decimal), timeFormatter.string(from: recommendedTempBasal.recommendedDate))
                     cell.selectionStyle = .default
                 } else {
-                    cell.detailTextLabel?.text = emptyValueString
+                    cell.subtitleLabel?.text = "––"
                 }
 
                 if settingTempBasal {
@@ -466,6 +518,41 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         }
     }
 
+    private func tableView(_ tableView: UITableView, updateSubtitleFor cell: ChartTableViewCell, at indexPath: IndexPath) {
+        switch Section(rawValue: indexPath.section)! {
+        case .charts:
+            switch ChartRow(rawValue: indexPath.row)! {
+            case .glucose:
+                if let eventualGlucose = eventualGlucoseDescription {
+                    cell.subtitleLabel?.text = String(format: NSLocalizedString("Eventually %@", comment: "The subtitle format describing eventual glucose. (1: localized glucose value description)"), eventualGlucose)
+                } else {
+                    cell.subtitleLabel?.text = nil
+                }
+            case .iob:
+                if let currentIOB = currentIOBDescription {
+                    cell.subtitleLabel?.text = currentIOB
+                } else {
+                    cell.subtitleLabel?.text = nil
+                }
+            case .dose:
+                if  let total = totalDelivery,
+                    let totalString = integerFormatter.string(from: NSNumber(value: total)) {
+                    cell.subtitleLabel?.text = String(format: NSLocalizedString("%@ U Total", comment: "The subtitle format describing total insulin. (1: localized insulin total)"), totalString)
+                } else {
+                    cell.subtitleLabel?.text = nil
+                }
+            case .cob:
+                if let currentCOB = currentCOBDescription {
+                    cell.subtitleLabel?.text = currentCOB
+                } else {
+                    cell.subtitleLabel?.text = nil
+                }
+            }
+        case .status:
+            break
+        }
+    }
+
     // MARK: - UITableViewDelegate
 
     override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
@@ -518,12 +605,29 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         }
     }
 
-    // MARK: - UIGestureRecognizerDelegate
+    // MARK: - UIGestureRecognizer
 
     func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
         return true
     }
 
+    @objc func handlePan(_ gestureRecognizer: UIGestureRecognizer) {
+        switch gestureRecognizer.state {
+        case .possible, .changed:
+            // Follow your dreams!
+            break
+        case .began, .cancelled, .ended, .failed:
+            for case let row as ChartTableViewCell in self.tableView.visibleCells {
+                let forwards = gestureRecognizer.state == .began
+                UIView.animate(withDuration: forwards ? 0.2 : 0.5, delay: forwards ? 0 : 1, animations: {
+                    let alpha: CGFloat = forwards ? 0 : 1
+                    row.titleLabel?.alpha = alpha
+                    row.subtitleLabel?.alpha = alpha
+                })
+            }
+        }
+    }
+
     // MARK: - Actions
 
     override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
@@ -594,6 +698,9 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         }
     }
 
+    /// Unwind segue action from the CarbEntryEditViewController
+    ///
+    /// - parameter segue: The unwind segue
     @IBAction func unwindFromEditing(_ segue: UIStoryboardSegue) {
         if let carbVC = segue.source as? CarbEntryEditViewController, let updatedEntry = carbVC.updatedCarbEntry {
 
@@ -634,7 +741,6 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
     }
 
     @IBAction func unwindFromSettings(_ segue: UIStoryboardSegue) {
-        
     }
 
     private func createWorkoutButtonItem(selected: Bool) -> UIBarButtonItem {
diff --git a/Loop/Views/ChartContentView.swift b/Loop/Views/ChartContentView.swift
index 530b8914cc..9147d7e49e 100644
--- a/Loop/Views/ChartContentView.swift
+++ b/Loop/Views/ChartContentView.swift
@@ -13,7 +13,14 @@ class ChartContentView: UIView {
     override func layoutSubviews() {
         super.layoutSubviews()
 
-        chartView = chartGenerator?(bounds)
+        if chartView == nil || chartView!.frame != bounds {
+            chartView = chartGenerator?(bounds)
+        }
+    }
+
+    func reloadChart() {
+        chartView = nil
+        setNeedsLayout()
     }
 
     var chartGenerator: ((CGRect) -> UIView?)? {
diff --git a/Loop/Views/ChartPointsTouchHighlightLayerViewCache.swift b/Loop/Views/ChartPointsTouchHighlightLayerViewCache.swift
index f1c77e7254..e436d5e7c6 100644
--- a/Loop/Views/ChartPointsTouchHighlightLayerViewCache.swift
+++ b/Loop/Views/ChartPointsTouchHighlightLayerViewCache.swift
@@ -20,8 +20,6 @@ final class ChartPointsTouchHighlightLayerViewCache {
     private lazy var labelY: UILabel = {
         let label = UILabel()
         label.font = UIFont.monospacedDigitSystemFont(ofSize: 15, weight: UIFontWeightBold)
-        label.textAlignment = .center
-        label.backgroundColor = UIColor.white
 
         return label
     }()
@@ -76,18 +74,13 @@ final class ChartPointsTouchHighlightLayerViewCache {
 
                     label.text = text
                     label.sizeToFit()
-                    label.frame.size.height += 4
-                    label.frame.size.width += label.frame.size.height / 2
-                    label.center.y = innerFrame.origin.y - 1
+                    label.center.y = innerFrame.origin.y - 21
                     label.center.x = chartPointModel.screenLoc.x
                     label.frame.origin.x = min(max(label.frame.origin.x, innerFrame.origin.x), innerFrame.maxX - label.frame.size.width)
                     label.frame.origin.makeIntegralInPlaceWithDisplayScale(chart.view.traitCollection.displayScale)
-                    label.layer.cornerRadius = label.frame.size.height / 2
-                    label.layer.borderWidth = 1 / max(1, chart.view.traitCollection.displayScale)
 
                     if label.superview == nil {
                         label.textColor = tintColor
-                        label.layer.borderColor = tintColor.cgColor
 
                         containerView.addSubview(label)
                     }
diff --git a/Loop/Views/ChartTableViewCell.swift b/Loop/Views/ChartTableViewCell.swift
index f047abaaba..fe0a60d6f8 100644
--- a/Loop/Views/ChartTableViewCell.swift
+++ b/Loop/Views/ChartTableViewCell.swift
@@ -13,6 +13,8 @@ final class ChartTableViewCell: UITableViewCell {
 
     @IBOutlet var chartContentView: ChartContentView!
 
+    @IBOutlet var titleLabel: UILabel?
+
     @IBOutlet var subtitleLabel: UILabel?
 
     override func prepareForReuse() {
@@ -22,6 +24,6 @@ final class ChartTableViewCell: UITableViewCell {
     }
 
     func reloadChart() {
-        chartContentView.setNeedsLayout()
+        chartContentView.reloadChart()
     }
 }
diff --git a/Loop/Views/TitleSubtitleTableViewCell.swift b/Loop/Views/TitleSubtitleTableViewCell.swift
new file mode 100644
index 0000000000..ab993a3d15
--- /dev/null
+++ b/Loop/Views/TitleSubtitleTableViewCell.swift
@@ -0,0 +1,37 @@
+//
+//  TitleSubtitleTableViewCell.swift
+//  Loop
+//
+//  Created by Nate Racklyeft on 9/28/16.
+//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+//
+
+import UIKit
+
+class TitleSubtitleTableViewCell: UITableViewCell {
+
+    @IBOutlet weak var titleLabel: UILabel!
+
+    @IBOutlet weak var subtitleLabel: UILabel! {
+        didSet {
+            subtitleLabel.textColor = UIColor.secondaryLabelColor
+        }
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+
+        gradient.frame = bounds
+    }
+
+    private lazy var gradient = CAGradientLayer()
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+
+        gradient.frame = bounds
+        gradient.colors = [UIColor.white.cgColor, UIColor.cellBackgroundColor.cgColor]
+        backgroundView?.layer.insertSublayer(gradient, at: 0)
+    }
+
+}

From ea3383745a8494e36db7edff9612e200449d4039 Mon Sep 17 00:00:00 2001
From: Nathan Racklyeft <loudnate@gmail.com>
Date: Wed, 28 Sep 2016 22:38:59 -0700
Subject: [PATCH 2/2] Displaying boluses

---
 Loop.xcodeproj/project.pbxproj                |  4 ++
 Loop/Managers/StatusChartManager.swift        | 57 +++++++++++++++----
 ...ChartPointsScatterDownTrianglesLayer.swift | 32 +++++++++++
 3 files changed, 83 insertions(+), 10 deletions(-)
 create mode 100644 Loop/Views/ChartPointsScatterDownTrianglesLayer.swift

diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
index 7861d5042c..f032694a9e 100644
--- a/Loop.xcodeproj/project.pbxproj
+++ b/Loop.xcodeproj/project.pbxproj
@@ -70,6 +70,7 @@
 		437CEECA1CD84DB7003C8C80 /* BatteryLevelHUDView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEC91CD84DB7003C8C80 /* BatteryLevelHUDView.swift */; };
 		437CEEE41CDE5C0A003C8C80 /* UIImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437CEEE31CDE5C0A003C8C80 /* UIImage.swift */; };
 		437D9BA31D7BC977007245E8 /* PredictionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */; };
+		43880F951D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43880F941D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift */; };
 		438849EA1D297CB6003B3F23 /* NightscoutService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849E91D297CB6003B3F23 /* NightscoutService.swift */; };
 		438849EC1D29EC34003B3F23 /* AmplitudeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849EB1D29EC34003B3F23 /* AmplitudeService.swift */; };
 		438849EE1D2A1EBB003B3F23 /* MLabService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 438849ED1D2A1EBB003B3F23 /* MLabService.swift */; };
@@ -298,6 +299,7 @@
 		437CEEE31CDE5C0A003C8C80 /* UIImage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UIImage.swift; sourceTree = "<group>"; };
 		437D9BA11D7B5203007245E8 /* Loop.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Loop.xcconfig; sourceTree = "<group>"; };
 		437D9BA21D7BC977007245E8 /* PredictionTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PredictionTableViewController.swift; sourceTree = "<group>"; };
+		43880F941D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPointsScatterDownTrianglesLayer.swift; sourceTree = "<group>"; };
 		438849E91D297CB6003B3F23 /* NightscoutService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NightscoutService.swift; sourceTree = "<group>"; };
 		438849EB1D29EC34003B3F23 /* AmplitudeService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmplitudeService.swift; sourceTree = "<group>"; };
 		438849ED1D2A1EBB003B3F23 /* MLabService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MLabService.swift; sourceTree = "<group>"; };
@@ -662,6 +664,7 @@
 				437CCADB1D284B830075D2C3 /* ButtonTableViewCell.swift */,
 				434F54581D28805E002A9274 /* ButtonTableViewCell.xib */,
 				4313EDDF1D8A6BF90060FA79 /* ChartContentView.swift */,
+				43880F941D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift */,
 				43F41C341D3B623800C11ED6 /* ChartPointsTouchHighlightLayerViewCache.swift */,
 				4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */,
 				4337615E1D52F487004A3647 /* GlucoseHUDView.swift */,
@@ -1078,6 +1081,7 @@
 				4337615F1D52F487004A3647 /* GlucoseHUDView.swift in Sources */,
 				438849EE1D2A1EBB003B3F23 /* MLabService.swift in Sources */,
 				438D42FB1D7D11A4003244B0 /* PredictionInputEffectTableViewCell.swift in Sources */,
+				43880F951D9CD54A009061A8 /* ChartPointsScatterDownTrianglesLayer.swift in Sources */,
 				43F4EF1D1BA2A57600526CE1 /* DiagnosticLogger.swift in Sources */,
 				432E73CB1D24B3D6009AD15D /* RemoteDataManager.swift in Sources */,
 				438DADC81CDE8F8B007697A5 /* LoopStateView.swift in Sources */,
diff --git a/Loop/Managers/StatusChartManager.swift b/Loop/Managers/StatusChartManager.swift
index 846eb24afa..7779751e66 100644
--- a/Loop/Managers/StatusChartManager.swift
+++ b/Loop/Managers/StatusChartManager.swift
@@ -157,26 +157,45 @@ final class StatusChartsManager {
 
     var doseEntries: [DoseEntry] = [] {
         didSet {
-            basalDosePoints = doseEntries.reduce([], { (points, entry) -> [ChartPoint] in
-                if entry.unit == .unitsPerHour {
+            var basalDosePoints = [ChartPoint]()
+            var bolusDosePoints = [ChartPoint]()
+            var allDosePoints = [ChartPoint]()
+
+            for entry in doseEntries {
+                switch entry.unit {
+                case .unitsPerHour:
                     // TODO: Display the DateInterval
                     let startX = ChartAxisValueDate(date: entry.startDate, formatter: dateFormatter)
                     let endX = ChartAxisValueDate(date: entry.endDate, formatter: dateFormatter)
                     let zero = ChartAxisValueInt(0)
                     let value = ChartAxisValueDoubleLog(actualDouble: entry.value, unitString: "U/hour", formatter: doseFormatter)
 
-                    let newPoints = [
+                    basalDosePoints += [
                         ChartPoint(x: startX, y: zero),
                         ChartPoint(x: startX, y: value),
                         ChartPoint(x: endX, y: value),
                         ChartPoint(x: endX, y: zero)
                     ]
 
-                    return points + newPoints
-                } else {
-                    return points
+                    if entry.value != 0 {
+                        allDosePoints += [
+                            ChartPoint(x: startX, y: value),
+                            ChartPoint(x: endX, y: value)
+                        ]
+                    }
+                case .units:
+                    let x = ChartAxisValueDate(date: entry.startDate, formatter: dateFormatter)
+                    let y = ChartAxisValueDoubleLog(actualDouble: entry.value, unitString: "U", formatter: doseFormatter)
+
+                    let point = ChartPoint(x: x, y: y)
+                    bolusDosePoints.append(point)
+                    allDosePoints.append(point)
                 }
-            })
+            }
+
+            self.basalDosePoints = basalDosePoints
+            self.bolusDosePoints = bolusDosePoints
+            self.allDosePoints = allDosePoints
         }
     }
 
@@ -263,6 +282,15 @@ final class StatusChartsManager {
         }
     }
 
+    private var bolusDosePoints: [ChartPoint] = [] {
+        didSet {
+            doseChart = nil
+            xAxisValues = nil
+        }
+    }
+
+    private var allDosePoints: [ChartPoint] = []
+
     private var xAxisValues: [ChartAxisValue]? {
         didSet {
             if let xAxisValues = xAxisValues, xAxisValues.count > 1 {
@@ -586,7 +614,7 @@ final class StatusChartsManager {
             return nil
         }
 
-        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(basalDosePoints + iobDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: log10(2) / 2, axisValueGenerator: { ChartAxisValueDoubleLog(screenLocDouble: $0, formatter: self.integerFormatter, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: true)
+        let yAxisValues = ChartAxisValuesGenerator.generateYAxisValuesWithChartPoints(basalDosePoints + bolusDosePoints + iobDisplayRangePoints, minSegmentCount: 2, maxSegmentCount: 3, multiple: log10(2) / 2, axisValueGenerator: { ChartAxisValueDoubleLog(screenLocDouble: $0, formatter: self.integerFormatter, labelSettings: self.axisLabelSettings) }, addPaddingSegmentIfEdge: true)
 
         let yAxisModel = ChartAxisModel(axisValues: yAxisValues, lineColor: axisLineColor)
 
@@ -606,6 +634,14 @@ final class StatusChartsManager {
             doseArea = nil
         }
 
+        let bolusLayer: ChartPointsScatterDownTrianglesLayer<ChartPoint>?
+
+        if bolusDosePoints.count > 0 {
+            bolusLayer = ChartPointsScatterDownTrianglesLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: bolusDosePoints, displayDelay: 0, itemSize: CGSize(width: 12, height: 12), itemFillColor: UIColor.doseTintColor)
+        } else {
+            bolusLayer = nil
+        }
+
         // Grid lines
         let gridLayer = ChartGuideLinesLayer(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, axis: .xAndY, settings: guideLinesLayerSettings, onlyVisibleX: true, onlyVisibleY: false)
 
@@ -624,7 +660,7 @@ final class StatusChartsManager {
             xAxis: xAxis,
             yAxis: yAxis,
             innerFrame: innerFrame,
-            chartPoints: basalDosePoints.filter { $0.y.scalar != 0 },
+            chartPoints: allDosePoints,
             tintColor: UIColor.doseTintColor,
             labelCenterY: chartSettings.top,
             gestureRecognizer: panGestureRecognizer
@@ -637,7 +673,8 @@ final class StatusChartsManager {
             zeroGuidelineLayer,
             doseChartCache?.highlightLayer,
             doseArea,
-            doseLine
+            doseLine,
+            bolusLayer
         ]
         
         return Chart(frame: frame, layers: layers.flatMap { $0 })
diff --git a/Loop/Views/ChartPointsScatterDownTrianglesLayer.swift b/Loop/Views/ChartPointsScatterDownTrianglesLayer.swift
new file mode 100644
index 0000000000..8dce720d83
--- /dev/null
+++ b/Loop/Views/ChartPointsScatterDownTrianglesLayer.swift
@@ -0,0 +1,32 @@
+//
+//  ChartPointsScatterDownTrianglesLayer.swift
+//  Loop
+//
+//  Created by Nate Racklyeft on 9/28/16.
+//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+//
+
+import SwiftCharts
+
+
+class ChartPointsScatterDownTrianglesLayer<T: ChartPoint>: ChartPointsScatterLayer<T> {
+
+    required init(xAxis: ChartAxisLayer, yAxis: ChartAxisLayer, innerFrame: CGRect, chartPoints: [T], displayDelay: Float, itemSize: CGSize, itemFillColor: UIColor) {
+        super.init(xAxis: xAxis, yAxis: yAxis, innerFrame: innerFrame, chartPoints: chartPoints, displayDelay: displayDelay, itemSize: itemSize, itemFillColor: itemFillColor)
+    }
+
+    override func drawChartPointModel(context: CGContext, chartPointModel: ChartPointLayerModel<T>) {
+        let w = self.itemSize.width
+        let h = self.itemSize.height
+
+        let path = CGMutablePath()
+        path.move(to: CGPoint(x: chartPointModel.screenLoc.x, y: chartPointModel.screenLoc.y + h / 2))
+        path.addLine(to: CGPoint(x: chartPointModel.screenLoc.x + w / 2, y: chartPointModel.screenLoc.y - h / 2))
+        path.addLine(to: CGPoint(x: chartPointModel.screenLoc.x - w / 2, y: chartPointModel.screenLoc.y - h / 2))
+        path.closeSubpath()
+
+        context.setFillColor(self.itemFillColor.cgColor)
+        context.addPath(path)
+        context.fillPath()
+    }
+}