diff --git a/xdrip.xcodeproj/project.pbxproj b/xdrip.xcodeproj/project.pbxproj
index 5982b0c52..fa89e3ace 100644
--- a/xdrip.xcodeproj/project.pbxproj
+++ b/xdrip.xcodeproj/project.pbxproj
@@ -211,6 +211,7 @@
 		47F7B1C62C68BBE100609DA7 /* ConstantsCalibrationAlgorithms.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A1585422EDB706007F5B5D /* ConstantsCalibrationAlgorithms.swift */; };
 		47F7B1CD2C68CC3000609DA7 /* ConstantsCalibrationAlgorithms.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A1585422EDB706007F5B5D /* ConstantsCalibrationAlgorithms.swift */; };
 		47FB28082636B04200042FFB /* StatisticsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47FB28072636B04200042FFB /* StatisticsManager.swift */; };
+		991A4F042D0F78EB00071ED6 /* CircleProgressBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 991A4F032D0F78EB00071ED6 /* CircleProgressBarView.swift */; };
 		CE1B2FE025D0264B00F642F5 /* LaunchScreen.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE1B2FD125D0264900F642F5 /* LaunchScreen.strings */; };
 		CE1B2FE125D0264B00F642F5 /* Main.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE1B2FD425D0264900F642F5 /* Main.strings */; };
 		D400F8032778BD8000B57648 /* TextsTreatmentsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D400F8022778BD8000B57648 /* TextsTreatmentsView.swift */; };
@@ -1037,6 +1038,7 @@
 		47FB28072636B04200042FFB /* StatisticsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatisticsManager.swift; sourceTree = "<group>"; };
 		666E283826F7E54C00ACE4DF /* xDrip.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = xDrip.xcconfig; path = xdrip/xDrip.xcconfig; sourceTree = "<group>"; };
 		666E283926F7E54C00ACE4DF /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Version.xcconfig; path = xdrip/Version.xcconfig; sourceTree = "<group>"; };
+		991A4F032D0F78EB00071ED6 /* CircleProgressBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircleProgressBarView.swift; sourceTree = "<group>"; };
 		CE1B2FC825D0261500F642F5 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Alerts.strings; sourceTree = "<group>"; };
 		CE1B2FCD25D0264900F642F5 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AlertTypesSettingsView.strings; sourceTree = "<group>"; };
 		CE1B2FCE25D0264900F642F5 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WatlaaView.strings; sourceTree = "<group>"; };
@@ -3176,6 +3178,7 @@
 			isa = PBXGroup;
 			children = (
 				F8BECB01235CE3E20060DAE1 /* BloodGlucoseChartView.swift */,
+				991A4F032D0F78EB00071ED6 /* CircleProgressBarView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -4774,6 +4777,7 @@
 				F8A1850C25643B16000EF8A0 /* Double+Smoothable.swift in Sources */,
 				F8CB59C8273EF9F800BA199E /* DexcomAlgorithmState.swift in Sources */,
 				F890E07A247687AE008FB2EC /* URL.swift in Sources */,
+				991A4F042D0F78EB00071ED6 /* CircleProgressBarView.swift in Sources */,
 				F8B3A856227F28DC004BA588 /* AlertTypeSettingsViewController.swift in Sources */,
 				F8A1584F22ECB281007F5B5D /* SettingsViewInfoViewModel.swift in Sources */,
 				F8B3A845227F090E004BA588 /* SettingsViewDexcomShareSettingsViewModel.swift in Sources */,
diff --git a/xdrip/Storyboards/Base.lproj/Main.storyboard b/xdrip/Storyboards/Base.lproj/Main.storyboard
index 110f8e13d..1f40cadcc 100644
--- a/xdrip/Storyboards/Base.lproj/Main.storyboard
+++ b/xdrip/Storyboards/Base.lproj/Main.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="49e-Tb-3d3">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="49e-Tb-3d3">
     <device id="retina6_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -614,26 +614,29 @@
                                             <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="ZF3-Ii-L0R">
                                                 <rect key="frame" x="8" y="9" width="374" height="72"/>
                                                 <subviews>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GCd-14-jW6" userLabel="ContainerCircleProgressBar">
+                                                        <rect key="frame" x="0.0" y="0.0" width="74.666666666666671" height="72"/>
+                                                    </view>
                                                     <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="SZT-uZ-ehB">
-                                                        <rect key="frame" x="0.0" y="0.0" width="93.666666666666671" height="72"/>
+                                                        <rect key="frame" x="74.666666666666671" y="0.0" width="75.000000000000014" height="72"/>
                                                         <subviews>
                                                             <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="uJH-Rw-6gq">
-                                                                <rect key="frame" x="0.0" y="0.0" width="93.666666666666671" height="31"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="75" height="31"/>
                                                                 <subviews>
                                                                     <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="4Yj-1u-9gb">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="93.666666666666671" height="31"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="75" height="31"/>
                                                                         <subviews>
                                                                             <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="zgL-6W-Gvk">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="93.666666666666671" height="14.333333333333334"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="75" height="14.333333333333334"/>
                                                                                 <subviews>
                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Low " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B0Q-ux-IHf">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="45.666666666666664" height="14.333333333333334"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="36.666666666666664" height="14.333333333333334"/>
                                                                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="12"/>
                                                                                         <color key="textColor" white="0.80000000000000004" alpha="1" colorSpace="calibratedWhite"/>
                                                                                         <nil key="highlightedColor"/>
                                                                                     </label>
                                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="(-)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ncy-6l-nO2">
-                                                                                        <rect key="frame" x="47.666666666666657" y="0.0" width="46" height="14.333333333333334"/>
+                                                                                        <rect key="frame" x="38.666666666666657" y="0.0" width="36.333333333333343" height="14.333333333333334"/>
                                                                                         <rect key="contentStretch" x="0.25" y="0.0" width="1" height="1"/>
                                                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                                         <color key="textColor" systemColor="systemGrayColor"/>
@@ -642,7 +645,7 @@
                                                                                 </subviews>
                                                                             </stackView>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4LK-sw-cBS">
-                                                                                <rect key="frame" x="0.0" y="14.333333333333316" width="93.666666666666671" height="16.666666666666671"/>
+                                                                                <rect key="frame" x="0.0" y="14.333333333333316" width="75" height="16.666666666666671"/>
                                                                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                                 <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                 <nil key="highlightedColor"/>
@@ -652,10 +655,10 @@
                                                                 </subviews>
                                                             </stackView>
                                                             <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="Obw-wp-KUf">
-                                                                <rect key="frame" x="0.0" y="40.999999999999943" width="93.666666666666671" height="31"/>
+                                                                <rect key="frame" x="0.0" y="40.999999999999943" width="75" height="31"/>
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Average" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="na4-pU-1Ik">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="93.666666666666671" height="14.666666666666666"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="75" height="14.666666666666666"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="14.5" id="Y5C-dU-QL5"/>
                                                                         </constraints>
@@ -664,7 +667,7 @@
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6JK-yH-Ykh">
-                                                                        <rect key="frame" x="0.0" y="16.666666666666742" width="93.666666666666671" height="14.333333333333336"/>
+                                                                        <rect key="frame" x="0.0" y="16.666666666666742" width="75" height="14.333333333333336"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
@@ -674,19 +677,19 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="uEY-tC-jSj">
-                                                        <rect key="frame" x="93.666666666666686" y="0.0" width="93.333333333333314" height="72"/>
+                                                        <rect key="frame" x="149.66666666666666" y="0.0" width="74.666666666666657" height="72"/>
                                                         <subviews>
                                                             <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="FXz-Xw-6vF">
-                                                                <rect key="frame" x="0.0" y="0.0" width="93.333333333333329" height="31"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="74.666666666666671" height="31"/>
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="In Range" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="63h-Q9-PbK">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="93.333333333333329" height="14.666666666666666"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="74.666666666666671" height="14.666666666666666"/>
                                                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="12"/>
                                                                         <color key="textColor" white="0.80000000000000004" alpha="1" colorSpace="calibratedWhite"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="apa-6w-gic">
-                                                                        <rect key="frame" x="0.0" y="16.666666666666686" width="93.333333333333329" height="14.333333333333336"/>
+                                                                        <rect key="frame" x="0.0" y="16.666666666666686" width="74.666666666666671" height="14.333333333333336"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
@@ -694,10 +697,10 @@
                                                                 </subviews>
                                                             </stackView>
                                                             <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="wHS-Bs-0Sf">
-                                                                <rect key="frame" x="0.0" y="40.999999999999943" width="93.333333333333329" height="31"/>
+                                                                <rect key="frame" x="0.0" y="40.999999999999943" width="74.666666666666671" height="31"/>
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="HbA1c" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9Ud-mR-3u4">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="93.333333333333329" height="14.666666666666666"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="74.666666666666671" height="14.666666666666666"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="14.5" id="r3A-Hz-ywo"/>
                                                                         </constraints>
@@ -706,7 +709,7 @@
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n2x-3q-js1">
-                                                                        <rect key="frame" x="0.0" y="16.666666666666742" width="93.333333333333329" height="14.333333333333336"/>
+                                                                        <rect key="frame" x="0.0" y="16.666666666666742" width="74.666666666666671" height="14.333333333333336"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
@@ -716,22 +719,22 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Ysc-jl-ban">
-                                                        <rect key="frame" x="187" y="0.0" width="93.666666666666686" height="72"/>
+                                                        <rect key="frame" x="224.33333333333337" y="0.0" width="75" height="72"/>
                                                         <subviews>
                                                             <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="8Xq-WO-Fun">
-                                                                <rect key="frame" x="0.0" y="0.0" width="93.666666666666671" height="31"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="75" height="31"/>
                                                                 <subviews>
                                                                     <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="EWG-Tb-ypA">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="93.666666666666671" height="14.666666666666666"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="75" height="14.666666666666666"/>
                                                                         <subviews>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="High" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bUK-pC-4bd">
-                                                                                <rect key="frame" x="0.0" y="0.0" width="45.666666666666664" height="14.666666666666666"/>
+                                                                                <rect key="frame" x="0.0" y="0.0" width="36.333333333333336" height="14.666666666666666"/>
                                                                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="12"/>
                                                                                 <color key="textColor" white="0.80000000000000004" alpha="1" colorSpace="calibratedWhite"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
                                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="(-)" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xlz-6g-zzD">
-                                                                                <rect key="frame" x="47.666666666666657" y="0.0" width="46" height="14.666666666666666"/>
+                                                                                <rect key="frame" x="38.333333333333343" y="0.0" width="36.666666666666657" height="14.666666666666666"/>
                                                                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                                 <color key="textColor" systemColor="systemGrayColor"/>
                                                                                 <nil key="highlightedColor"/>
@@ -739,7 +742,7 @@
                                                                         </subviews>
                                                                     </stackView>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EbR-T4-LIg">
-                                                                        <rect key="frame" x="0.0" y="16.666666666666686" width="93.666666666666671" height="14.333333333333336"/>
+                                                                        <rect key="frame" x="0.0" y="16.666666666666686" width="75" height="14.333333333333336"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
@@ -747,10 +750,10 @@
                                                                 </subviews>
                                                             </stackView>
                                                             <stackView opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="TCF-VO-5Ac">
-                                                                <rect key="frame" x="0.0" y="40.999999999999943" width="93.666666666666671" height="31"/>
+                                                                <rect key="frame" x="0.0" y="40.999999999999943" width="75" height="31"/>
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CV" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PZI-Ln-kfh">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="93.666666666666671" height="14.666666666666666"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="75" height="14.666666666666666"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="14.5" id="YCj-mm-7me"/>
                                                                         </constraints>
@@ -759,7 +762,7 @@
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-%" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Vdh-xP-Z0Y">
-                                                                        <rect key="frame" x="0.0" y="16.666666666666742" width="93.666666666666671" height="14.333333333333336"/>
+                                                                        <rect key="frame" x="0.0" y="16.666666666666742" width="75" height="14.333333333333336"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
@@ -769,19 +772,19 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="qCk-lg-c76">
-                                                        <rect key="frame" x="280.66666666666669" y="0.0" width="93.333333333333314" height="72"/>
+                                                        <rect key="frame" x="299.33333333333331" y="0.0" width="74.666666666666686" height="72"/>
                                                         <subviews>
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vm5-IB-4CY" customClass="PieChart" customModule="PieCharts">
-                                                                <rect key="frame" x="0.0" y="0.0" width="93.333333333333329" height="51.666666666666664"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="74.666666666666671" height="51.666666666666664"/>
                                                                 <subviews>
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c1z-wL-Eye">
-                                                                        <rect key="frame" x="47.666666666666629" y="25.999999999999943" width="0.0" height="0.0"/>
+                                                                        <rect key="frame" x="38.333333333333371" y="25.999999999999943" width="0.0" height="0.0"/>
                                                                         <fontDescription key="fontDescription" type="system" weight="heavy" pointSize="18"/>
                                                                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                     <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="large" translatesAutoresizingMaskIntoConstraints="NO" id="U7P-eg-yrE">
-                                                                        <rect key="frame" x="28" y="7.3333333333333144" width="37" height="37"/>
+                                                                        <rect key="frame" x="18.666666666666686" y="7.3333333333333144" width="37" height="37"/>
                                                                         <color key="color" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                     </activityIndicatorView>
                                                                 </subviews>
@@ -816,7 +819,7 @@
                                                                 </userDefinedRuntimeAttributes>
                                                             </view>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="- - -" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="On3-dy-RgB">
-                                                                <rect key="frame" x="0.0" y="57.666666666666693" width="93.333333333333329" height="14.333333333333336"/>
+                                                                <rect key="frame" x="0.0" y="57.666666666666693" width="74.666666666666671" height="14.333333333333336"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                 <color key="textColor" systemColor="systemGrayColor"/>
                                                                 <nil key="highlightedColor"/>
@@ -894,7 +897,7 @@
                                                                 <preferredSymbolConfiguration key="preferredSymbolConfiguration" configurationType="pointSize" pointSize="18" scale="small"/>
                                                             </imageView>
                                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="VW3-lv-4DN">
-                                                                <rect key="frame" x="22" y="2.6666666666666714" width="17.666666666666671" height="123"/>
+                                                                <rect key="frame" x="22" y="2.3333333333333286" width="17.666666666666671" height="123"/>
                                                                 <color key="tintColor" systemColor="systemGrayColor"/>
                                                                 <imageReference key="image" image="d.circle" catalog="system" symbolScale="small"/>
                                                                 <preferredSymbolConfiguration key="preferredSymbolConfiguration" configurationType="pointSize" pointSize="19" scale="small"/>
@@ -975,6 +978,7 @@
                         <outlet property="chartPanGestureRecognizerOutlet" destination="Fi5-iu-Usk" id="zn5-wp-DKt"/>
                         <outlet property="clockLabelOutlet" destination="rSC-H3-vfk" id="kqu-7I-7VN"/>
                         <outlet property="clockView" destination="ETk-QH-u1x" id="XuQ-dY-93L"/>
+                        <outlet property="containerCircleProgressBar" destination="GCd-14-jW6" id="Ggv-Zr-B7a"/>
                         <outlet property="cvTitleLabelOutlet" destination="PZI-Ln-kfh" id="IKV-zy-dNM"/>
                         <outlet property="dataSourceConnectionStatusImage" destination="txf-6L-J3o" id="J5T-UJ-wzy"/>
                         <outlet property="dataSourceKeepAliveImageOutlet" destination="VW3-lv-4DN" id="rWr-Rl-Sdt"/>
diff --git a/xdrip/View Controllers/Root View Controller/RootViewController.swift b/xdrip/View Controllers/Root View Controller/RootViewController.swift
index 317aee22e..ed935c02e 100644
--- a/xdrip/View Controllers/Root View Controller/RootViewController.swift	
+++ b/xdrip/View Controllers/Root View Controller/RootViewController.swift	
@@ -173,7 +173,8 @@ final class RootViewController: UIViewController, ObservableObject {
     }
         
     /// outlets for statistics view
-    @IBOutlet weak var statisticsView: UIView!
+	@IBOutlet weak var containerCircleProgressBar: UIView!
+	@IBOutlet weak var statisticsView: UIView!
     @IBOutlet weak var pieChartOutlet: PieChart!
     @IBOutlet weak var lowStatisticLabelOutlet: UILabel!
     @IBOutlet weak var inRangeStatisticLabelOutlet: UILabel!
@@ -377,6 +378,12 @@ final class RootViewController: UIViewController, ObservableObject {
     
     /// can be used as a shortcut to switch between different TIR calculation methods. The user will be notified of the change via UI transitions to show what has changed in the calculation limits
     @IBAction func statisticsViewDoubleTapGestureRecognizer(_ sender: UITapGestureRecognizer) {
+		
+		// add demo pressing for reset circle progress bar
+		if let progressBar = circleProgressBar {
+			progressBar.restartProgress()
+			resetUpdateCircleProgressBar()
+		}
         
         let previousTimeInRangeType = UserDefaults.standard.timeInRangeType
         
@@ -616,7 +623,12 @@ final class RootViewController: UIViewController, ObservableObject {
     
     /// uiview to be used for the night-mode overlay to darken the app screen
     private var overlayView: UIView?
-
+	
+	/// Circle Progress Bar
+	private var circleProgressBar: CircleProgressBarView?
+	
+	///
+	private var mockTimerNewValueCircleProgressBar: Timer?
     
     // MARK: - overriden functions
     
@@ -1773,8 +1785,31 @@ final class RootViewController: UIViewController, ObservableObject {
         self.chartOutlet.reloadChart()
         
         self.miniChartOutlet.reloadChart()
-        
+		
+		// Setup Circle Progress Bar
+		circleProgressBar = CircleProgressBarView(frame: CGRect(x: 0, y: 0, width: 75, height: 75))
+		if let progressBar = circleProgressBar {
+			progressBar.center = containerCircleProgressBar.center
+			// set 5min green, 5min yellow
+			progressBar.setProgress(greenDuration: 300, yellowDuration: 300)
+			containerCircleProgressBar.addSubview(progressBar)
+		}
     }
+	
+	func stopRepeatingUpdateCircleProgressBar() {
+		mockTimerNewValueCircleProgressBar?.invalidate()
+		mockTimerNewValueCircleProgressBar = nil
+	}
+	
+	private func resetUpdateCircleProgressBar() {
+		  stopRepeatingUpdateCircleProgressBar()
+	}
+	
+	@objc private func runUpdateCircleProgressBar() {
+		if let progressBar = circleProgressBar {
+			progressBar.restartProgress()
+		}
+	}
     
     // MARK: - private helper functions
 
diff --git a/xdrip/Views/CircleProgressBarView.swift b/xdrip/Views/CircleProgressBarView.swift
new file mode 100644
index 000000000..670667b58
--- /dev/null
+++ b/xdrip/Views/CircleProgressBarView.swift
@@ -0,0 +1,230 @@
+//
+//  CircleProgressBarView.swift
+//  xdrip
+//
+//  Created by Олег Стригунов on 15.12.2024.
+//  Copyright © 2024 Johan Degraeve. All rights reserved.
+//
+
+import UIKit
+
+class CircleProgressBarView: UIView, CAAnimationDelegate {
+	
+	// MARK: - Properties
+	private let trackLayer: CAShapeLayer = {
+		let layer = CAShapeLayer()
+		layer.strokeColor = UIColor.systemGray3.cgColor
+		layer.lineWidth = 10
+		layer.strokeEnd = 1.0
+		layer.lineCap = .butt
+		layer.fillColor = UIColor.clear.cgColor
+		return layer
+	}()
+	
+	private let redLayer: CAShapeLayer = {
+		let layer = CAShapeLayer()
+		layer.strokeColor = UIColor.systemRed.cgColor
+		layer.lineWidth = 10
+		layer.strokeEnd = 1.0
+		layer.lineCap = .butt
+		layer.fillColor = UIColor.clear.cgColor
+		layer.isHidden = true
+		return layer
+	}()
+	
+	private let greenLayer: CAShapeLayer = {
+		let layer = CAShapeLayer()
+		layer.strokeColor = UIColor.systemGreen.cgColor
+		layer.lineWidth = 10
+		layer.strokeEnd = 0
+		layer.lineCap = .butt
+		layer.fillColor = UIColor.clear.cgColor
+		return layer
+	}()
+	
+	private let yellowLayer: CAShapeLayer = {
+		let layer = CAShapeLayer()
+		layer.strokeColor = UIColor.systemYellow.cgColor
+		layer.lineWidth = 10
+		layer.strokeEnd = 0
+		layer.lineCap = .butt
+		layer.fillColor = UIColor.clear.cgColor
+		return layer
+	}()
+	
+	private let timerLabel: UILabel = {
+		let label = UILabel()
+		label.textAlignment = .center
+		label.font = UIFont.systemFont(ofSize: 10, weight: .regular)
+		label.textColor = .white
+		label.text = "00:00"
+		return label
+	}()
+	
+	private var centerPoint: CGPoint {
+		CGPoint(x: bounds.midX, y: bounds.midY)
+	}
+	
+	private var radius: CGFloat {
+		min(bounds.width, bounds.height) / 2 - trackLayer.lineWidth / 2
+	}
+	
+	private lazy var trackPath: UIBezierPath = {
+		UIBezierPath(
+			arcCenter: centerPoint,
+			radius: radius,
+			startAngle: -CGFloat.pi / 2,
+			endAngle: 3 * CGFloat.pi / 2,
+			clockwise: true
+		)
+	}()
+	
+	private lazy var redPath: UIBezierPath = {
+		UIBezierPath(
+			arcCenter: centerPoint,
+			radius: radius,
+			startAngle: -CGFloat.pi / 2,
+			endAngle: 3 * CGFloat.pi / 2,
+			clockwise: true
+		)
+	}()
+	
+	private lazy var greenPath: UIBezierPath = {
+		UIBezierPath(
+			arcCenter: centerPoint,
+			radius: radius,
+			startAngle: -CGFloat.pi / 2,
+			endAngle: 3 * CGFloat.pi / 2,
+			clockwise: true
+		)
+	}()
+	
+	private lazy var yellowPath: UIBezierPath = {
+		UIBezierPath(
+			arcCenter: centerPoint,
+			radius: radius,
+			startAngle: -CGFloat.pi / 2,
+			endAngle: 3 * CGFloat.pi / 2,
+			clockwise: true
+		)
+	}()
+	
+	private var completedAnimations = 0
+	private var totalAnimations = 0
+	private var timer: Timer?
+	private var elapsedTime: TimeInterval = 0
+	
+	private var greenDuration: CFTimeInterval = 0
+	private var yellowDuration: CFTimeInterval = 0
+	
+	// MARK: - Init
+	override init(frame: CGRect) {
+		super.init(frame: frame)
+		setupView()
+	}
+	
+	required init?(coder: NSCoder) {
+		super.init(coder: coder)
+		setupView()
+	}
+	
+	// MARK: - View Setup
+	private func setupView() {
+		yellowLayer.path = yellowPath.cgPath
+		greenLayer.path = greenPath.cgPath
+		redLayer.path = redPath.cgPath
+		trackLayer.path = trackPath.cgPath
+		
+		layer.addSublayer(trackLayer)
+		layer.addSublayer(yellowLayer)
+		layer.addSublayer(greenLayer)
+		layer.addSublayer(redLayer)
+		
+		addSubview(timerLabel)
+	}
+	
+	override func layoutSubviews() {
+		super.layoutSubviews()
+		updatePaths()
+		timerLabel.frame = CGRect(x: 0, y: 0, width: bounds.width, height: 20)
+		timerLabel.center = centerPoint
+	}
+	
+	private func updatePaths() {
+		yellowLayer.path = yellowPath.cgPath
+		greenLayer.path = greenPath.cgPath
+		redLayer.path = redPath.cgPath
+	}
+	
+	// MARK: - Set Progress
+	func setProgress(greenDuration: CFTimeInterval, yellowDuration: CFTimeInterval) {
+		self.greenDuration = greenDuration
+		self.yellowDuration = yellowDuration
+		
+		totalAnimations = 2
+		completedAnimations = 0
+		
+		elapsedTime = 0
+		startTimer()
+		
+		let duration = greenDuration + yellowDuration
+		let greenValue = CGFloat(greenDuration) / CGFloat(duration)
+		
+		animateLayer(layer: yellowLayer, toValue: 1.0, duration: duration)
+		animateLayer(layer: greenLayer, toValue: greenValue, duration: greenDuration)
+	}
+	
+	private func animateLayer(layer: CAShapeLayer, toValue: CGFloat, duration: CFTimeInterval) {
+		let animation = CABasicAnimation(keyPath: "strokeEnd")
+		animation.toValue = toValue
+		animation.duration = duration
+		animation.fillMode = .forwards
+		animation.isRemovedOnCompletion = false
+		animation.delegate = self
+		layer.add(animation, forKey: nil)
+	}
+	
+	// MARK: - Timer
+	private func startTimer() {
+		timer?.invalidate()
+		timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(updateTimer), userInfo: nil, repeats: true)
+	}
+	
+	@objc private func updateTimer() {
+		elapsedTime += 1
+		let minutes = Int(elapsedTime) / 60
+		let seconds = Int(elapsedTime) % 60
+		timerLabel.text = String(format: "%02d:%02d", minutes, seconds)
+	}
+
+	func animationDidStop(_ anim: CAAnimation, finished flag: Bool) {
+		if flag {
+			completedAnimations += 1
+			if completedAnimations == totalAnimations {
+				redLayer.isHidden = false
+			}
+		}
+	}
+	
+	func resetProgress() {
+		redLayer.isHidden = true
+		yellowLayer.removeAllAnimations()
+		greenLayer.removeAllAnimations()
+		yellowLayer.strokeEnd = 0
+		greenLayer.strokeEnd = 0
+		
+		timer?.invalidate()
+		timerLabel.text = "00:00"
+		timer = nil
+	}
+	
+	// MARK: - Restart Progress
+	func restartProgress() {
+		resetProgress()
+		DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+			self.setProgress(greenDuration: self.greenDuration, yellowDuration: self.yellowDuration)
+		}
+	}
+}
+
+