diff --git a/Podfile b/Podfile
index 25f9d77..12bd394 100644
--- a/Podfile
+++ b/Podfile
@@ -7,4 +7,6 @@ link_with 'malaria-ios', 'malaria-iosTests'
 
 pod 'Alamofire', '~> 1.2.3'
 pod 'SwiftyJSON', '~> 2.2.0'
-pod 'Charts', '~> 2.1.0'
\ No newline at end of file
+pod 'Charts', '~> 2.1.0'
+pod 'CircleProgressView', :git => 'https://github.com/bphenriques/CircleProgressView.git', :tag => '0.9.10'
+pod 'HorizontalProgressView', :git => 'https://github.com/bphenriques/HorizontalProgressView.git', :tag => '0.9.5'
\ No newline at end of file
diff --git a/malaria-ios.xcodeproj/project.pbxproj b/malaria-ios.xcodeproj/project.pbxproj
index 6c57245..06968cf 100644
--- a/malaria-ios.xcodeproj/project.pbxproj
+++ b/malaria-ios.xcodeproj/project.pbxproj
@@ -76,17 +76,15 @@
 		209F60B61B6DA6B100EDA461 /* TestTimedInsertions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20EE2E451B28AC7900948240 /* TestTimedInsertions.swift */; };
 		209F60B81B6E2AB300EDA461 /* MedicineFrontEndExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 209F60B71B6E2AB300EDA461 /* MedicineFrontEndExtension.swift */; };
 		209F60BF1B6E4AED00EDA461 /* Sounds in Resources */ = {isa = PBXBuildFile; fileRef = 209F60BE1B6E4AED00EDA461 /* Sounds */; };
+		20C7188A1B763573007424F6 /* ToolbarWithDone.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20C718891B763573007424F6 /* ToolbarWithDone.swift */; };
 		20EA06DB1B2234DA00D6840E /* Model.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 20EA06D41B2234DA00D6840E /* Model.xcdatamodeld */; };
 		20EF68501B72DF1600286A0F /* UIButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20EF684F1B72DF1600286A0F /* UIButton.swift */; };
 		20FC56BD1B71951300D51801 /* PresentsModalityDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FC56BC1B71951300D51801 /* PresentsModalityDelegate.swift */; };
 		20FC56C11B729F8B00D51801 /* PeaceCorpsInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FC56C01B729F8B00D51801 /* PeaceCorpsInfo.swift */; };
 		20FC56C31B72C1BC00D51801 /* CalendarSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FC56C21B72C1BC00D51801 /* CalendarSettings.swift */; };
 		20FC56EB1B72C91300D51801 /* UserSettingsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FC56EA1B72C91300D51801 /* UserSettingsManager.swift */; };
-		20FC56ED1B72C95200D51801 /* CircleProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FC56EC1B72C95200D51801 /* CircleProgressView.swift */; };
-		20FC56F01B72C97200D51801 /* HorizontalGraphBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FC56EF1B72C97200D51801 /* HorizontalGraphBar.swift */; };
 		20FC56F31B72C9AF00D51801 /* UIStoryboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FC56F21B72C9AF00D51801 /* UIStoryboard.swift */; };
 		20FC56F51B72C9CF00D51801 /* UIColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FC56F41B72C9CF00D51801 /* UIColor.swift */; };
-		20FC56F71B72C9E700D51801 /* UIPickView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FC56F61B72C9E700D51801 /* UIPickView.swift */; };
 		20FC56F91B72C9FB00D51801 /* UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FC56F81B72C9FB00D51801 /* UIView.swift */; };
 		20FC56FB1B72CA1200D51801 /* UITabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FC56FA1B72CA1200D51801 /* UITabBarController.swift */; };
 		20FC56FD1B72CA2800D51801 /* Globals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20FC56FC1B72CA2800D51801 /* Globals.swift */; };
@@ -209,6 +207,7 @@
 		20ABA5AF1B697DFA00F18F39 /* Model7.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model7.xcdatamodel; sourceTree = "<group>"; };
 		20C13EDE1B5E561F00D66C00 /* ModelV5Cached.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = ModelV5Cached.xcdatamodel; sourceTree = "<group>"; };
 		20C20FEE1B39D828007A7414 /* TestWeeklyMedicineStatistics.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestWeeklyMedicineStatistics.swift; sourceTree = "<group>"; };
+		20C718891B763573007424F6 /* ToolbarWithDone.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ToolbarWithDone.swift; path = SupportingFiles/ToolbarWithDone.swift; sourceTree = "<group>"; };
 		20E6DC3A1B38B53C0003B777 /* TestPlanTrip.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestPlanTrip.swift; sourceTree = "<group>"; };
 		20EA06D51B2234DA00D6840E /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
 		20EA07061B23258900D6840E /* TestNSDateExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TestNSDateExtensions.swift; sourceTree = "<group>"; };
@@ -222,11 +221,8 @@
 		20FC56C01B729F8B00D51801 /* PeaceCorpsInfo.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PeaceCorpsInfo.swift; path = "malaria-ios/ViewControllers/SupportingFiles/PeaceCorpsInfo.swift"; sourceTree = SOURCE_ROOT; };
 		20FC56C21B72C1BC00D51801 /* CalendarSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CalendarSettings.swift; path = PillStats/CalendarSettings.swift; sourceTree = "<group>"; };
 		20FC56EA1B72C91300D51801 /* UserSettingsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UserSettingsManager.swift; path = "malaria-ios/ViewControllers/SupportingFiles/UserSettingsManager.swift"; sourceTree = SOURCE_ROOT; };
-		20FC56EC1B72C95200D51801 /* CircleProgressView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CircleProgressView.swift; path = "malaria-ios/ViewControllers/SupportingFiles/UIViews/CircleProgressView.swift"; sourceTree = SOURCE_ROOT; };
-		20FC56EF1B72C97200D51801 /* HorizontalGraphBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = HorizontalGraphBar.swift; path = SupportingFiles/UIViews/HorizontalGraphBar.swift; sourceTree = "<group>"; };
 		20FC56F21B72C9AF00D51801 /* UIStoryboard.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UIStoryboard.swift; path = SupportingFiles/Extensions/UIStoryboard.swift; sourceTree = "<group>"; };
 		20FC56F41B72C9CF00D51801 /* UIColor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UIColor.swift; path = SupportingFiles/Extensions/UIColor.swift; sourceTree = "<group>"; };
-		20FC56F61B72C9E700D51801 /* UIPickView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UIPickView.swift; path = SupportingFiles/Extensions/UIPickView.swift; sourceTree = "<group>"; };
 		20FC56F81B72C9FB00D51801 /* UIView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UIView.swift; path = SupportingFiles/Extensions/UIView.swift; sourceTree = "<group>"; };
 		20FC56FA1B72CA1200D51801 /* UITabBarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UITabBarController.swift; path = SupportingFiles/Extensions/UITabBarController.swift; sourceTree = "<group>"; };
 		20FC56FC1B72CA2800D51801 /* Globals.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Globals.swift; path = SupportingFiles/Extensions/Globals.swift; sourceTree = "<group>"; };
@@ -331,7 +327,6 @@
 			children = (
 				20FC57001B72CA8D00D51801 /* ExternalCVCalendar */,
 				20FC56F11B72C98800D51801 /* Extensions */,
-				20FC56EE1B72C95D00D51801 /* UIViews */,
 				209F60BE1B6E4AED00EDA461 /* Sounds */,
 				203F0B251B481CB900826E06 /* ValuePickers */,
 				20FC56EA1B72C91300D51801 /* UserSettingsManager.swift */,
@@ -535,6 +530,7 @@
 				200A18CE1B64F51300EC2A65 /* MedicinePickerViewTrip.swift */,
 				200A18D01B64F52000EC2A65 /* TimePickerViewer.swift */,
 				205E417D1B6AE74E0028A8D7 /* TripLocationHistoryPickerViewer.swift */,
+				20C718891B763573007424F6 /* ToolbarWithDone.swift */,
 			);
 			name = ValuePickers;
 			sourceTree = "<group>";
@@ -550,15 +546,6 @@
 			name = PillStats;
 			sourceTree = "<group>";
 		};
-		20FC56EE1B72C95D00D51801 /* UIViews */ = {
-			isa = PBXGroup;
-			children = (
-				20FC56EF1B72C97200D51801 /* HorizontalGraphBar.swift */,
-				20FC56EC1B72C95200D51801 /* CircleProgressView.swift */,
-			);
-			name = UIViews;
-			sourceTree = "<group>";
-		};
 		20FC56F11B72C98800D51801 /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -566,7 +553,6 @@
 				20FC56FC1B72CA2800D51801 /* Globals.swift */,
 				20FC56FA1B72CA1200D51801 /* UITabBarController.swift */,
 				20FC56F81B72C9FB00D51801 /* UIView.swift */,
-				20FC56F61B72C9E700D51801 /* UIPickView.swift */,
 				20FC56F41B72C9CF00D51801 /* UIColor.swift */,
 				20FC56F21B72C9AF00D51801 /* UIStoryboard.swift */,
 				20EF684F1B72DF1600286A0F /* UIButton.swift */,
@@ -874,7 +860,6 @@
 				200A18C71B64F4B800EC2A65 /* CachedStatistics.swift in Sources */,
 				20FC572D1B72CA8D00D51801 /* CVCalendarWeekday.swift in Sources */,
 				200A18D51B64F55F00EC2A65 /* InfoHubViewController.swift in Sources */,
-				20FC56ED1B72C95200D51801 /* CircleProgressView.swift in Sources */,
 				20FC56FB1B72CA1200D51801 /* UITabBarController.swift in Sources */,
 				20FC56C31B72C1BC00D51801 /* CalendarSettings.swift in Sources */,
 				200A18C91B64F4C400EC2A65 /* MonthAdherenceCell.swift in Sources */,
@@ -944,9 +929,8 @@
 				20FC57261B72CA8D00D51801 /* CVCalendarViewAnimator.swift in Sources */,
 				209F60B81B6E2AB300EDA461 /* MedicineFrontEndExtension.swift in Sources */,
 				20FC57311B72CA8D00D51801 /* CVScrollDirection.swift in Sources */,
+				20C7188A1B763573007424F6 /* ToolbarWithDone.swift in Sources */,
 				200A18C31B64F48E00EC2A65 /* PillsStatsViewController.swift in Sources */,
-				20FC56F71B72C9E700D51801 /* UIPickView.swift in Sources */,
-				20FC56F01B72C97200D51801 /* HorizontalGraphBar.swift in Sources */,
 				200C72C21B40368600998100 /* CollectionPosts.swift in Sources */,
 				20EA06DB1B2234DA00D6840E /* Model.xcdatamodeld in Sources */,
 				20FC56F51B72C9CF00D51801 /* UIColor.swift in Sources */,
diff --git a/malaria-ios/Base.lproj/Main.storyboard b/malaria-ios/Base.lproj/Main.storyboard
index 84807ab..a636229 100644
--- a/malaria-ios/Base.lproj/Main.storyboard
+++ b/malaria-ios/Base.lproj/Main.storyboard
@@ -331,7 +331,7 @@
                                             <action selector="historyButtonHandler:" destination="cfZ-pD-OHm" eventType="touchUpInside" id="dJ5-Rr-4rx"/>
                                         </connections>
                                     </button>
-                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wsy-a8-zYC" userLabel="LocationInput">
+                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Location" textAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="wsy-a8-zYC" userLabel="LocationInput">
                                         <rect key="frame" x="125" y="8" width="397" height="30"/>
                                         <color key="backgroundColor" red="0.52156862745098043" green="0.72156862745098038" blue="0.31372549019607843" alpha="0.93000000000000005" colorSpace="calibratedRGB"/>
                                         <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -814,39 +814,45 @@
                                     <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 </collectionViewFlowLayout>
                                 <cells>
-                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="postCollectionCell" id="Iel-fI-OaE" customClass="PeaceCorpsMessageCollectionViewCell" customModule="malaria_ios" customModuleProvider="target">
+                                    <collectionViewCell opaque="NO" clipsSubviews="YES" contentMode="center" reuseIdentifier="postCollectionCell" id="Iel-fI-OaE" customClass="PeaceCorpsMessageCollectionViewCell" customModule="malaria_ios" customModuleProvider="target">
                                         <autoresizingMask key="autoresizingMask"/>
                                         <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                             <rect key="frame" x="0.0" y="0.0" width="140" height="72"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="n2t-UQ-9He" userLabel="PostTitle">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="InfoHubButton" translatesAutoresizingMaskIntoConstraints="NO" id="Pu1-47-Vqa">
                                                     <rect key="frame" x="0.0" y="0.0" width="140" height="72"/>
-                                                    <fontDescription key="fontDescription" name="ChalkboardSE-Regular" family="Chalkboard SE" pointSize="15"/>
-                                                    <inset key="contentEdgeInsets" minX="10" minY="5" maxX="10" maxY="5"/>
-                                                    <state key="normal" title="Post Title" backgroundImage="InfoHubButton">
-                                                        <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                                        <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                                    </state>
-                                                </button>
+                                                </imageView>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Title" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="8" translatesAutoresizingMaskIntoConstraints="NO" id="z92-ZL-HLa">
+                                                    <rect key="frame" x="10" y="11" width="120" height="50"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="120" id="PkU-Ot-txC"/>
+                                                        <constraint firstAttribute="height" constant="50" id="gan-PQ-PmJ"/>
+                                                    </constraints>
+                                                    <fontDescription key="fontDescription" name="AmericanTypewriter" family="American Typewriter" pointSize="16"/>
+                                                    <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
                                             </subviews>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         </view>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <constraints>
-                                            <constraint firstItem="n2t-UQ-9He" firstAttribute="leading" secondItem="Iel-fI-OaE" secondAttribute="leading" id="3Iy-OO-Jso"/>
-                                            <constraint firstItem="n2t-UQ-9He" firstAttribute="trailing" secondItem="Iel-fI-OaE" secondAttribute="trailing" id="6go-V5-6cs"/>
-                                            <constraint firstItem="n2t-UQ-9He" firstAttribute="top" secondItem="Iel-fI-OaE" secondAttribute="top" id="Zzz-ZE-Fms"/>
-                                            <constraint firstAttribute="bottom" secondItem="n2t-UQ-9He" secondAttribute="bottom" id="cHV-Vj-y5w"/>
+                                            <constraint firstItem="Pu1-47-Vqa" firstAttribute="top" secondItem="Iel-fI-OaE" secondAttribute="top" id="2lC-hQ-Sua"/>
+                                            <constraint firstItem="Pu1-47-Vqa" firstAttribute="centerY" secondItem="z92-ZL-HLa" secondAttribute="centerY" id="ceQ-0R-hOa"/>
+                                            <constraint firstAttribute="bottom" secondItem="Pu1-47-Vqa" secondAttribute="bottom" id="dfp-kh-iZG"/>
+                                            <constraint firstItem="Pu1-47-Vqa" firstAttribute="leading" secondItem="Iel-fI-OaE" secondAttribute="leading" id="evj-q0-yA5"/>
+                                            <constraint firstItem="Pu1-47-Vqa" firstAttribute="centerX" secondItem="z92-ZL-HLa" secondAttribute="centerX" id="jZN-Ny-Iek"/>
+                                            <constraint firstAttribute="trailing" secondItem="Pu1-47-Vqa" secondAttribute="trailing" id="mn1-SV-OPR"/>
                                         </constraints>
                                         <connections>
-                                            <outlet property="postBtn" destination="n2t-UQ-9He" id="fkv-mM-xvX"/>
+                                            <outlet property="postTitle" destination="z92-ZL-HLa" id="kdi-nM-Iqi"/>
                                         </connections>
                                     </collectionViewCell>
                                 </cells>
                                 <connections>
-                                    <outlet property="dataSource" destination="Y7x-5C-nhp" id="IvI-Bd-uEa"/>
-                                    <outlet property="delegate" destination="Y7x-5C-nhp" id="kAt-wx-J5D"/>
+                                    <outlet property="dataSource" destination="Y7x-5C-nhp" id="8kU-UL-PWF"/>
+                                    <outlet property="delegate" destination="Y7x-5C-nhp" id="Ai6-8W-O5P"/>
                                 </connections>
                             </collectionView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TNk-Of-8CA" userLabel="Settings">
@@ -1064,20 +1070,12 @@
                                                     <color key="textColor" red="0.43787151575088501" green="0.32177186012268066" blue="0.27448359131813049" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="p0V-fL-VuA" customClass="HorizontalGraphBar" customModule="malaria_ios" customModuleProvider="target">
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="p0V-fL-VuA" customClass="HorizontalGraphBar" customModule="HorizontalProgressView">
                                                     <rect key="frame" x="68" y="22.5" width="454" height="15"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="15" id="ZoF-ij-OS7"/>
                                                     </constraints>
-                                                    <userDefinedRuntimeAttributes>
-                                                        <userDefinedRuntimeAttribute type="number" keyPath="progressValue">
-                                                            <real key="value" value="50"/>
-                                                        </userDefinedRuntimeAttribute>
-                                                        <userDefinedRuntimeAttribute type="color" keyPath="progressColor">
-                                                            <color key="value" red="0.85882352939999995" green="0.33725490200000002" blue="0.36862745099999999" alpha="1" colorSpace="calibratedRGB"/>
-                                                        </userDefinedRuntimeAttribute>
-                                                    </userDefinedRuntimeAttributes>
                                                 </view>
                                             </subviews>
                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
@@ -1124,7 +1122,7 @@
                                         <rect key="frame" x="21" y="20" width="527" height="197.5"/>
                                         <color key="backgroundColor" red="0.97647058819999999" green="0.94509803920000002" blue="0.87058823529999996" alpha="1" colorSpace="calibratedRGB"/>
                                     </view>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VB8-6y-hHC" userLabel="ProgressCircle" customClass="CircleProgressView" customModule="malaria_ios" customModuleProvider="target">
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VB8-6y-hHC" userLabel="ProgressCircle" customClass="CircleProgressView" customModule="CircleProgressView">
                                         <rect key="frame" x="241.5" y="83" width="85" height="85"/>
                                         <color key="backgroundColor" red="0.97647058819999999" green="0.94509803920000002" blue="0.87058823529999996" alpha="0.97999999999999998" colorSpace="calibratedRGB"/>
                                         <constraints>
@@ -1144,9 +1142,6 @@
                                             <userDefinedRuntimeAttribute type="number" keyPath="valueProgress">
                                                 <real key="value" value="0.0"/>
                                             </userDefinedRuntimeAttribute>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                                <real key="value" value="20"/>
-                                            </userDefinedRuntimeAttribute>
                                         </userDefinedRuntimeAttributes>
                                     </view>
                                 </subviews>
diff --git a/malaria-ios/ViewControllers/InfoHub/InfoHubViewController.swift b/malaria-ios/ViewControllers/InfoHub/InfoHubViewController.swift
index bf32c03..46bd952 100644
--- a/malaria-ios/ViewControllers/InfoHub/InfoHubViewController.swift
+++ b/malaria-ios/ViewControllers/InfoHub/InfoHubViewController.swift
@@ -29,7 +29,7 @@ class InfoHubViewController : UIViewController{
         refreshScreen()
     }
     
-    func pullRefreshHandler(){
+    internal func pullRefreshHandler(){
         Logger.Info("Pull refresh")
         syncManager.sync(EndpointType.Posts.path(), save: true, completionHandler: {(url: String, error: NSError?) in
             if let e = error {
@@ -42,7 +42,7 @@ class InfoHubViewController : UIViewController{
         })
     }
     
-   func refreshScreen() {
+   private func refreshScreen() {
         if !refreshFromCoreData(){
             syncManager.sync(EndpointType.Posts.path(), save: true, completionHandler: {(url: String, error: NSError?) in
                 if error != nil{
@@ -106,12 +106,7 @@ extension InfoHubViewController : UICollectionViewDelegate, UICollectionViewData
         let post = posts[indexPath.row]
         let cell = collectionView.dequeueReusableCellWithReuseIdentifier("postCollectionCell", forIndexPath: indexPath) as! PeaceCorpsMessageCollectionViewCell
         
-        cell.postBtn.titleLabel?.numberOfLines = 0
-        cell.postBtn.titleLabel?.textAlignment = .Center
-        
-        //these two calls in sequence removes animation on title change
-        cell.postBtn.titleLabel?.text = post.title
-        cell.postBtn.setTitle(post.title, forState: .Normal)
+        cell.postTitle.text = post.title
         
         return cell
     }
@@ -137,7 +132,7 @@ extension InfoHubViewController : UICollectionViewDelegate, UICollectionViewData
     
     private func determineSpacing() -> CGFloat{
         let screenWidth = UIScreen.mainScreen().bounds.size.width
-        let numberItems = floor(screenWidth/PeaceCorpsMessageCollectionViewCell.CellWidth)
+        let numberItems = min(floor(screenWidth/PeaceCorpsMessageCollectionViewCell.CellWidth), 4)
         let remainingScreen = screenWidth - numberItems*PeaceCorpsMessageCollectionViewCell.CellWidth
         
         return floor(remainingScreen/(numberItems - 1 + 2)) //left and right margin plus space between cells (numItems - 1)
@@ -153,11 +148,11 @@ extension InfoHubViewController {
     }}
     
     private var CantUpdateFromPeaceCorpsAlertText: AlertText {get {
-        return ("Couldn't Update Peace Corps Messages.", "Please try again later")
+        return ("Couldn't update Peace Corps messages", "Please try again later")
     }}
     
     private var NoInternetConnectionAlertText: AlertText {get {
-        return ("Couldn't Update Peace Corps Messages.", "No available internet connection. Try again later")
+        return ("Couldn't update Peace Corps messages", "No available internet connection. Please try again later")
     }}
     
     //type of alerts options
@@ -168,6 +163,6 @@ extension InfoHubViewController {
 }
 
 class PeaceCorpsMessageCollectionViewCell : UICollectionViewCell{
+    @IBOutlet weak var postTitle: UILabel!
     static let CellWidth: CGFloat = 140
-    @IBOutlet weak var postBtn: UIButton!
 }
\ No newline at end of file
diff --git a/malaria-ios/ViewControllers/PillStats/CalendarSettings.swift b/malaria-ios/ViewControllers/PillStats/CalendarSettings.swift
index d7fb4be..516a9f4 100644
--- a/malaria-ios/ViewControllers/PillStats/CalendarSettings.swift
+++ b/malaria-ios/ViewControllers/PillStats/CalendarSettings.swift
@@ -23,7 +23,7 @@ extension MonthlyViewController: CVCalendarViewDelegate {
         }
     }
     
-    func shouldShowWeekdaysOut() -> Bool { return true }                                        /// show all days
+    func shouldShowWeekdaysOut() -> Bool { return false }                                        /// show all days
     func topMarker(shouldDisplayOnDayView dayView: DayView) -> Bool { return false }            /// hide line above day
 }
 
diff --git a/malaria-ios/ViewControllers/PillStats/MonthAdherenceCell.swift b/malaria-ios/ViewControllers/PillStats/MonthAdherenceCell.swift
index 5890035..0826495 100644
--- a/malaria-ios/ViewControllers/PillStats/MonthAdherenceCell.swift
+++ b/malaria-ios/ViewControllers/PillStats/MonthAdherenceCell.swift
@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import HorizontalProgressView
 
 @IBDesignable class AdherenceHorizontalBarCell: UITableViewCell {
     @IBInspectable var LowAdherenceColor: UIColor = UIColor(red: 0.894, green: 0.429, blue: 0.442, alpha: 1.0)
diff --git a/malaria-ios/ViewControllers/PillStats/MonthyViewController.swift b/malaria-ios/ViewControllers/PillStats/MonthyViewController.swift
index 06f3b04..74345a7 100644
--- a/malaria-ios/ViewControllers/PillStats/MonthyViewController.swift
+++ b/malaria-ios/ViewControllers/PillStats/MonthyViewController.swift
@@ -27,6 +27,7 @@ import UIKit
     var callback: (() -> ())?
     
     //helpers
+    private var firstRun = true
     private var previouslySelect: NSDate?
     private var animationFinished = true
     
@@ -37,6 +38,7 @@ import UIKit
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        previouslySelect = startDay
         monthLabel.text = generateMonthLabel(startDay)
         calendarView.toggleViewWithDate(startDay)
     }
@@ -129,14 +131,16 @@ extension MonthlyViewController: CVCalendarViewDelegate {
     
     func didSelectDayView(dayView: CVCalendarDayView) {
         let selected = dayView.date.convertedDate()!
-        if let previous = previouslySelect{
-            if previous.sameDayAs(selected) {
+        if let previous = previouslySelect {
+            
+            if (previous.sameMonthAs(selected) && !previous.sameDayAs(selected)) || (!firstRun && previous.sameDayAs(selected)) {
                 if let registryDate = dayView.date.convertedDate(){
                     popup(registryDate.startOfDay, dayView: dayView)
                 }
             }
         }
-        
+
+        firstRun = false
         previouslySelect = selected
     }
     
@@ -151,7 +155,6 @@ extension MonthlyViewController: CVCalendarViewDelegate {
         
         let (title, message) = generateTookMedicineActionSheetText(date)
         
-        
         let tookPillActionSheet: UIAlertController = UIAlertController(title: title, message: message, preferredStyle: .ActionSheet)
         tookPillActionSheet.addAction(UIAlertAction(title: TookMedicineAlertActionText.did, style: .Default, handler: { _ in
             if CachedStatistics.sharedInstance.registriesManager.addRegistry(date, tookMedicine: true, modifyEntry: true) {
@@ -199,7 +202,7 @@ extension MonthlyViewController: CVCalendarViewDelegate {
         }
     }
     
-    private func presentedDateUpdated(date: CVDate) {
+    func presentedDateUpdated(date: CVDate) {
         if monthLabel.text != generateMonthLabel(date.convertedDate()!) && self.animationFinished {
             let updatedMonthLabel = UILabel()
             updatedMonthLabel.text = generateMonthLabel(date.convertedDate()!)
@@ -245,7 +248,7 @@ extension MonthlyViewController {
     
     //selected future entry
     private var SelectedFutureDateAlertText: AlertText {get {
-        return ("Not possible to change entries in the future", "Try another day")
+        return ("Not possible to change entries in the future", "")
     }}
     
     private func generateTookMedicineActionSheetText(date: NSDate) -> AlertText {
@@ -253,20 +256,20 @@ extension MonthlyViewController {
         let tookMedicine = CachedStatistics.sharedInstance.registriesManager.tookMedicine(date)
         
         if tookMedicine != nil {
-            return ("You already took your " + (isWeekly ? "weekly" : "daily") + " pill.", "Have you taken your pill?")
+            return ("You already took your " + (isWeekly ? "weekly" : "daily") + " pill.", "Did you take your medicine on " + date.formatWith("d MMMM yyyy") + "?")
         } else {
-            return ("You did not took your " + (isWeekly ? "weekly" : "daily") + " pill.", "Have you taken your pill?")
+            return ("You didn't took your " + (isWeekly ? "weekly" : "daily") + " pill.", "Did you take your medicine on " + date.formatWith("d MMMM yyyy") + "?")
         }
     }
     
     //did take pill alert text
     private var TookMedicineAlertActionText: (did: String, didNot: String) {get {
-        return ("Yes, I did.", "No, I didn't")
+        return ("Yes, I did", "No, I didn't")
     }}
     
     //error
     private var ErrorAddRegistryAlertText: AlertText {get {
-        return ("Error updating.", "Please contact us by clicking the email icon on the setup screen")
+        return ("Error updating", "Please contact us by clicking the email icon on the setup screen")
     }}
     
     
diff --git a/malaria-ios/ViewControllers/PillStats/PillsStatsViewController.swift b/malaria-ios/ViewControllers/PillStats/PillsStatsViewController.swift
index 5850dff..167a501 100644
--- a/malaria-ios/ViewControllers/PillStats/PillsStatsViewController.swift
+++ b/malaria-ios/ViewControllers/PillStats/PillsStatsViewController.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import Charts
+import CircleProgressView
 
 @IBDesignable class PillsStatsViewController : UIViewController, PresentsModalityDelegate {
     @IBOutlet weak var adherenceSliderTable: UITableView!
@@ -69,6 +70,7 @@ import Charts
         cachedStats.retrieveMonthsData(NumberRecentMonths){
             self.adherenceSliderTable.reloadData()
         }
+        
         cachedStats.retrieveCachedStatistics({(progress: Float) in
             self.loadingGraphView!.valueProgress = progress
         }, completition: { _ in
diff --git a/malaria-ios/ViewControllers/PlanTrip/PlanTripViewController.swift b/malaria-ios/ViewControllers/PlanTrip/PlanTripViewController.swift
index fc75947..227057d 100644
--- a/malaria-ios/ViewControllers/PlanTrip/PlanTripViewController.swift
+++ b/malaria-ios/ViewControllers/PlanTrip/PlanTripViewController.swift
@@ -35,33 +35,26 @@ class PlanTripViewController: UIViewController {
     var arrivalDay = NSDate()
     var items = [(String, Bool)]()
     
-    lazy var toolBar: UIToolbar! = {
-        let keyboardToolbar = UIToolbar()
-        keyboardToolbar.sizeToFit()
-        let flexBarButton = UIBarButtonItem(barButtonSystemItem: .FlexibleSpace,target: nil, action: nil)
-        let doneBarButton = UIBarButtonItem(barButtonSystemItem: .Done, target: self, action: Selector("dismissInputView:"))
-        keyboardToolbar.items = [flexBarButton, doneBarButton]
-        
-        return keyboardToolbar
-    }()
-    
+    private var toolBar: ToolbarWithDone!
     
     override func viewDidLoad() {
         super.viewDidLoad()
                 
         view.backgroundColor = UIColor(patternImage: UIImage(named: "background")!)
         
+        toolBar = ToolbarWithDone(viewsWithToolbar: [location, packingList, arrival, departure, historyTextField])
+        
         location.inputAccessoryView = toolBar
         historyTextField.inputAccessoryView = toolBar
         
         //Setting up departure
-        departureDatePickerview = TimePickerView(view: departure, selectCallback: {(date: NSDate) in
+        departureDatePickerview = TimePickerView(pickerMode: .Date, startDate: departureDay, selectCallback: {(date: NSDate) in
             self.updateDeparture(date)
         })
         departure.inputAccessoryView = toolBar
         
         //Setting up arrival date picker
-        arrivalDatePickerview = TimePickerView(view: arrival, selectCallback: {(date: NSDate) in
+        arrivalDatePickerview = TimePickerView(pickerMode: .Date, startDate: arrivalDay, selectCallback: {(date: NSDate) in
             self.updateArrival(date)
         })
         arrival.inputAccessoryView = toolBar
@@ -86,8 +79,8 @@ class PlanTripViewController: UIViewController {
         updateDeparture(departureDay)
         
         //update input views
-        arrival.inputView = arrivalDatePickerview.generateInputView(.Date, startDate: arrivalDay)
-        departure.inputView = departureDatePickerview.generateInputView(.Date, startDate: departureDay)
+        arrival.inputView = toolBar.generateInputView(arrivalDatePickerview)
+        departure.inputView = toolBar.generateInputView(departureDatePickerview)
         
         //update history
         prepareHistoryValuePicker()
@@ -98,15 +91,7 @@ class PlanTripViewController: UIViewController {
             self.updateLocation(object)
         })
         
-        historyTextField.inputView = tripLocationHistoryPickerViewer.generateInputView()
-    }
-    
-    func dismissInputView(sender: UITextField){
-        location.endEditing(true)
-        packingList.endEditing(true)
-        arrival.endEditing(true)
-        departure.endEditing(true)
-        historyTextField.endEditing(true)
+        historyTextField.inputView = toolBar.generateInputView(tripLocationHistoryPickerViewer)
     }
     
     func selectItemsCallback(medicine: Medicine.Pill, listItems: [(String, Bool)]){
@@ -285,7 +270,7 @@ extension PlanTripViewController {
     
     //departure day error
     private var InvalidDepartureAlertText: AlertText {get {
-        return ("Error", "Departure day must happen before arrival")
+        return ("Error", "Departure day must be before arrival")
         }}
     
     //arrival day error
diff --git a/malaria-ios/ViewControllers/SetupScreen/SetupScreenViewController.swift b/malaria-ios/ViewControllers/SetupScreen/SetupScreenViewController.swift
index 182704d..82126bf 100644
--- a/malaria-ios/ViewControllers/SetupScreen/SetupScreenViewController.swift
+++ b/malaria-ios/ViewControllers/SetupScreen/SetupScreenViewController.swift
@@ -12,16 +12,7 @@ class SetupScreenViewController : UIViewController{
     private var medicinePicker: MedicinePickerView!
     private var timePickerview: TimePickerView!
     
-    lazy var toolBar: UIToolbar! = {
-        let keyboardToolbar = UIToolbar()
-        keyboardToolbar.sizeToFit()
-        let flexBarButton = UIBarButtonItem(barButtonSystemItem: .FlexibleSpace,target: nil, action: nil)
-        let doneBarButton = UIBarButtonItem(barButtonSystemItem: .Done, target: self, action: Selector("dismissInputView:"))
-        keyboardToolbar.items = [flexBarButton, doneBarButton]
-        
-        return keyboardToolbar
-        }()
-    
+    private var toolBar: ToolbarWithDone!
     
     //mangagers
     private var viewContext: NSManagedObjectContext!
@@ -29,6 +20,12 @@ class SetupScreenViewController : UIViewController{
     
     private var pillReminderNotificationTime: NSDate!
     
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        toolBar = ToolbarWithDone(viewsWithToolbar: [medicineName, reminderTime])
+    }
+    
     override func viewWillAppear(animated: Bool) {
         super.viewWillAppear(animated)
         
@@ -42,15 +39,15 @@ class SetupScreenViewController : UIViewController{
         medicinePicker = MedicinePickerView(context: viewContext, selectCallback: {(object: String) in
             self.medicineName.text = object
         })
-        medicineName.inputView = medicinePicker.generateInputView()
+        medicineName.inputView = toolBar.generateInputView(medicinePicker)
         medicineName.inputAccessoryView = toolBar
         
         //Setting up DatePickerView
-        timePickerview = TimePickerView(view: reminderTime, selectCallback: {(date: NSDate) in
+        timePickerview = TimePickerView(pickerMode: .Time, startDate: pillReminderNotificationTime, selectCallback: {(date: NSDate) in
             self.pillReminderNotificationTime = date
             self.refreshDate()
         })
-        reminderTime.inputView = timePickerview.generateInputView(.Time, startDate: pillReminderNotificationTime)
+        reminderTime.inputView = toolBar.generateInputView(timePickerview)
         reminderTime.inputAccessoryView = toolBar
         
         medicineName.text = medicinePicker.selectedValue
@@ -58,7 +55,7 @@ class SetupScreenViewController : UIViewController{
         refreshDate()
     }
     
-    func dismissInputView(sender: UITextField){
+    func dismissInputView(sender: UIView){
         medicineName.endEditing(true)
         reminderTime.endEditing(true)
     }
@@ -131,11 +128,11 @@ extension SetupScreenViewController {
     
     //existing medicine configured
     private var ReplaceMedicineAlertText: AlertText {get {
-        return ("There is already medicine configured", "The current configuration will be changed")
+        return ("This will change the current settings", "Your previous statistics won't be lost")
     }}
     
     //type of alerts options
     private var AlertOptions: (ok: String, cancel: String) {get {
-        return ("ok", "Cancel")
+        return ("Ok", "Cancel")
     }}
 }
\ No newline at end of file
diff --git a/malaria-ios/ViewControllers/SupportingFiles/Extensions/UIPickView.swift b/malaria-ios/ViewControllers/SupportingFiles/Extensions/UIPickView.swift
deleted file mode 100644
index a15392f..0000000
--- a/malaria-ios/ViewControllers/SupportingFiles/Extensions/UIPickView.swift
+++ /dev/null
@@ -1,19 +0,0 @@
-import Foundation
-import UIKit
-
-extension UIPickerView{
-    var ValuePickerHeight : CGFloat { get { return 250.0 } }
-    
-    func generateInputView() -> UIView{
-        let screenWidth = UIScreen.mainScreen().bounds.width
-        let inputView = UIView(frame: CGRectMake(0, 0, screenWidth, CGFloat(ValuePickerHeight)))
-        
-        let inputViewSize = self.frame.size.width
-
-        //fixed bad position on iPads
-        self.frame.origin.x = screenWidth*0.5 - inputViewSize*0.5
-        inputView.addSubview(self)
-        
-        return inputView
-    }
-}
\ No newline at end of file
diff --git a/malaria-ios/ViewControllers/SupportingFiles/ToolbarWithDone.swift b/malaria-ios/ViewControllers/SupportingFiles/ToolbarWithDone.swift
new file mode 100644
index 0000000..f34ae8a
--- /dev/null
+++ b/malaria-ios/ViewControllers/SupportingFiles/ToolbarWithDone.swift
@@ -0,0 +1,38 @@
+import UIKit
+
+public class ToolbarWithDone: UIToolbar {
+    public var viewsWithToolbar: [UIView] = []
+    
+    private let DoneButtonHeight: CGFloat = 40.0
+    private let DoneButtonWidth: CGFloat  = 100.0
+    
+    public init (viewsWithToolbar: [UIView]) {
+        self.viewsWithToolbar = viewsWithToolbar
+        super.init(frame: CGRectZero)
+        
+        sizeToFit()
+        let flexBarButton = UIBarButtonItem(barButtonSystemItem: .FlexibleSpace,target: nil, action: nil)
+        let doneBarButton = UIBarButtonItem(barButtonSystemItem: .Done, target: self, action: Selector("dismissInputView:"))
+        items = [flexBarButton, doneBarButton]
+    }
+
+    public required init(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+    }
+    
+    public func generateInputView(view: UIView, inputHeight: CGFloat = 200) -> UIView{
+        let screenWidth = UIScreen.mainScreen().bounds.width
+        let inputView = UIView(frame: CGRectMake(0, 0, screenWidth, inputHeight + DoneButtonHeight))
+        let inputViewSize = view.frame.size.width
+        
+        view.frame.origin.x = screenWidth*0.5 - inputViewSize*0.5
+        inputView.addSubview(view)
+        
+        return inputView
+    }
+    
+    //sender is a UIBarButtonItem
+    internal func dismissInputView(sender: UIView){
+        viewsWithToolbar.map({ $0.endEditing(true) })
+    }
+}
diff --git a/malaria-ios/ViewControllers/SupportingFiles/UIViews/CircleProgressView.swift b/malaria-ios/ViewControllers/SupportingFiles/UIViews/CircleProgressView.swift
deleted file mode 100644
index dddccf2..0000000
--- a/malaria-ios/ViewControllers/SupportingFiles/UIViews/CircleProgressView.swift
+++ /dev/null
@@ -1,63 +0,0 @@
-import UIKit
-
-@IBDesignable class CircleProgressView: UIView {
-    
-    @IBInspectable var circleColor: UIColor = UIColor(hex: 0xE3C79B)
-    @IBInspectable var progressColor: UIColor = UIColor(hex: 0xE46D71)
-    @IBInspectable var clockWise: Bool = true
-    @IBInspectable var lineWidth: CGFloat = 4.0 {
-        didSet {
-            backgroundCircle.lineWidth = lineWidth
-            self.progressCircle.lineWidth = lineWidth + 0.1
-        }
-    }
-    @IBInspectable var valueProgress: Float = 0 {
-        didSet {
-            self.progressCircle.strokeEnd = CGFloat(valueProgress) / 100
-        }
-    }
-    
-    private let backgroundCircle = CAShapeLayer()
-    private let progressCircle = CAShapeLayer()
-    
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        
-        self.backgroundColor = UIColor.clearColor()
-    }
-
-    required init(coder aDecoder: NSCoder) {
-        super.init(coder: aDecoder)
-    }
-    
-    override func drawRect(rect: CGRect) {
-        // Create path
-        let centerPointArc = CGPoint(x: frame.size.width / 2, y: frame.size.height / 2)
-        let radiusArc: CGFloat = self.frame.width / 2 * 0.8
-        var circlePath = UIBezierPath(arcCenter: centerPointArc, radius: radiusArc, startAngle: radial_angle(0), endAngle: radial_angle(360), clockwise: clockWise)
-        
-        // Define background circle still to be loaded
-        backgroundCircle.path = circlePath.CGPath
-        backgroundCircle.strokeColor = circleColor.CGColor
-        backgroundCircle.fillColor = UIColor.clearColor().CGColor
-        backgroundCircle.lineWidth = lineWidth
-        backgroundCircle.strokeStart = 0
-        backgroundCircle.strokeEnd = CGFloat(1.0)
-        
-        // Define circle showing loading
-        progressCircle.path = circlePath.CGPath
-        progressCircle.strokeColor = progressColor.CGColor
-        progressCircle.fillColor = UIColor.clearColor().CGColor
-        progressCircle.lineWidth = lineWidth + 0.1
-        progressCircle.strokeStart = 0
-        progressCircle.strokeEnd = CGFloat(valueProgress) / 100
-        
-        // set layers
-        layer.addSublayer(backgroundCircle)
-        layer.addSublayer(progressCircle)
-    }
-    
-    private func radial_angle(arc: CGFloat) -> CGFloat {
-        return CGFloat(M_PI) * arc / 180
-    }
-}
\ No newline at end of file
diff --git a/malaria-ios/ViewControllers/SupportingFiles/UIViews/HorizontalGraphBar.swift b/malaria-ios/ViewControllers/SupportingFiles/UIViews/HorizontalGraphBar.swift
deleted file mode 100644
index 07af376..0000000
--- a/malaria-ios/ViewControllers/SupportingFiles/UIViews/HorizontalGraphBar.swift
+++ /dev/null
@@ -1,30 +0,0 @@
-import Foundation
-import UIKit
-
-@IBDesignable class HorizontalGraphBar : UIView {
-    
-    @IBInspectable var progressValue: Float = 0 {
-        didSet {
-            self.setNeedsDisplay()
-        }
-    }
-    
-    @IBInspectable var progressColor: UIColor = UIColor.redColor() {
-        didSet {
-            self.setNeedsDisplay()
-        }
-    }
-    
-    override func drawRect(rect: CGRect) {
-        let progressWidth = rect.size.width * CGFloat(progressValue/100)
-        
-        let leftPart = CGRectMake(rect.origin.x, rect.origin.y, progressWidth, rect.size.height)
-        let rightPart = CGRectMake(rect.origin.x + progressWidth, rect.origin.y, rect.size.width - progressWidth, rect.size.height)
-        
-        progressColor.set()
-        UIRectFill(leftPart)
-        
-        backgroundColor?.set()
-        UIRectFill(rightPart)
-    }
-}
\ No newline at end of file
diff --git a/malaria-ios/ViewControllers/SupportingFiles/ValuePickers/PickerProvider.swift b/malaria-ios/ViewControllers/SupportingFiles/ValuePickers/PickerProvider.swift
index 3b89bff..779e420 100644
--- a/malaria-ios/ViewControllers/SupportingFiles/ValuePickers/PickerProvider.swift
+++ b/malaria-ios/ViewControllers/SupportingFiles/ValuePickers/PickerProvider.swift
@@ -1,28 +1,33 @@
 import Foundation
 import UIKit
 
-class PickerProvider: NSObject, UIPickerViewDataSource, UIPickerViewDelegate {
-    var possibleValues: [String]
-    let callback: (component: Int, row: Int, value: String) -> ()
+public class PickerProvider: NSObject{
+    public var possibleValues: [String]
+    private let callback: (component: Int, row: Int, value: String) -> ()
     
-    init(selectedCall:(component: Int, row: Int, value: String)->(), values: [String]) {
+    /// initializing
+    /// :param: `(component: Int, row: Int, value: String) -> ()`: selection call back
+    /// :param: `[String]`: array of possible values
+    public init(selectedCall: (component: Int, row: Int, value: String)->(), values: [String]) {
         possibleValues = values
         callback = selectedCall
     }
-    
-    func pickerView(pickerview: UIPickerView,numberOfRowsInComponent component: Int) -> Int {
+}
+
+extension PickerProvider : UIPickerViewDataSource, UIPickerViewDelegate  {
+    public func pickerView(pickerview: UIPickerView,numberOfRowsInComponent component: Int) -> Int {
         return possibleValues.count;
     }
     
-    func numberOfComponentsInPickerView(pickerView: UIPickerView) -> Int {
+    public func numberOfComponentsInPickerView(pickerView: UIPickerView) -> Int {
         return 1
     }
-
-    func pickerView(pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String {
+    
+    public func pickerView(pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String {
         return possibleValues[row];
     }
     
-    func pickerView(pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+    public func pickerView(pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
         callback(component: component, row: row, value: possibleValues[row]);
     }
 }
\ No newline at end of file
diff --git a/malaria-ios/ViewControllers/SupportingFiles/ValuePickers/TimePickerViewer.swift b/malaria-ios/ViewControllers/SupportingFiles/ValuePickers/TimePickerViewer.swift
index 2ef20ea..0adcd38 100644
--- a/malaria-ios/ViewControllers/SupportingFiles/ValuePickers/TimePickerViewer.swift
+++ b/malaria-ios/ViewControllers/SupportingFiles/ValuePickers/TimePickerViewer.swift
@@ -1,41 +1,29 @@
 import Foundation
 import UIKit
 
-class TimePickerView: UIDatePicker{
+public class TimePickerView: UIDatePicker{
     private var selectCallback: ((date: NSDate) -> ())!
-    private var DoneButtonHeight : CFloat { get { return 40.0 } }
-    private var DoneButtonWidth : CFloat { get { return 100.0 } }
-    private var ValuePickerHeight : CGFloat { get { return CGFloat(200) + CGFloat(DoneButtonHeight) } }
-    
     /// initialization
-    /// :param: `NSManagedObjectContext`: current context
+    /// :param: `UIDatePickerMode`: picker mode .Date or .Time
+    /// :param: `NSDate`: start date
     /// :param: `(object: String) -> ()`: on selection callback. Usually to change a view element content
-    init(view: UIView, selectCallback: (date: NSDate) -> ()){
+    public init(pickerMode: UIDatePickerMode, startDate: NSDate, selectCallback: (date: NSDate) -> ()){
         super.init(frame: CGRectZero)
         self.selectCallback = selectCallback
+        
+        let screenWidth = UIScreen.mainScreen().bounds.width
+        let inputViewWidth = self.frame.size.width
+        
+        self.frame = CGRectMake(screenWidth*0.5 - inputViewWidth*0.5, 0, 0, 0)
+        self.datePickerMode = pickerMode
+        self.date = startDate
+        self.addTarget(self, action: "onDateChange:", forControlEvents: .AllEvents)
     }
     
-    required init(coder aDecoder: NSCoder) {
+    public required init(coder aDecoder: NSCoder) {
         super.init(coder: aDecoder)
     }
     
-    /// Generates inputview
-    /// :param: `UIDatePickerMode`: The mode of the picker
-    /// :param: `NSDate`: the starting day
-    /// :returns: `UIView`: the generated view
-    func generateInputView(pickerMode: UIDatePickerMode, startDate: NSDate) -> UIView{
-        let inputView = UIView(frame: CGRectMake(0, 0, UIScreen.mainScreen().bounds.width, ValuePickerHeight))
-        
-        var datePickerView = UIDatePicker(frame: CGRectMake(0, CGFloat(DoneButtonHeight), 0, 0))
-        datePickerView.datePickerMode = pickerMode
-        datePickerView.date = startDate
-        datePickerView.addTarget(self, action: "onDateChange:", forControlEvents: .AllEvents)
-        
-        inputView.addSubview(datePickerView) // add date picker to UIView
-        
-        return inputView
-    }
-    
     internal func onDateChange(sender: UIDatePicker){
         selectCallback(date: sender.date)
     }