diff --git a/SampleJTAppleCalendar/Example Calendars/TestYearViewViewController.swift b/SampleJTAppleCalendar/Example Calendars/TestYearViewViewController.swift
index af4d79f0..e6a89393 100644
--- a/SampleJTAppleCalendar/Example Calendars/TestYearViewViewController.swift	
+++ b/SampleJTAppleCalendar/Example Calendars/TestYearViewViewController.swift	
@@ -10,13 +10,21 @@ import JTAppleCalendar
 
 class TestYearViewViewController: UIViewController {
     @IBOutlet var calendarView: JTACYearView!
+    @IBOutlet var scrollToTodayButton: UIButton!
+    @IBOutlet var monthSelectLabel: UILabel!
     let f = DateFormatter()
     
     override func viewDidLoad() {
         calendarView.calendarDataSource  = self
         calendarView.calendarDelegate  = self
         super.viewDidLoad()
+        self.monthSelectLabel.text = "Click to select month"
     }
+    
+    @IBAction func scrollToToday(_ sender: UIButton) {
+        calendarView.scrollToDate(Date(), at: .top , animated: true)
+    }
+    
 }
 
 
@@ -95,6 +103,14 @@ extension TestYearViewViewController: JTACYearViewDelegate, JTACYearViewDataSour
             return CGSize(width: width, height: height)
         }
     }
+    
+    func calendar(_ calendar: JTACYearView, didSelectMonth month: Month, dateRange: (start: Date, end: Date), cell: JTACMonthCell?, indexPath: IndexPath) {
+        let formatter1 = DateFormatter()
+        formatter1.dateFormat = "MMM YYYY"
+        let formatter2 = DateFormatter()
+        formatter2.dateFormat = "dd-MMM-YYYY"
+        self.monthSelectLabel.text = "Selected Month \(formatter1.string(from: dateRange.start))\nWith Date Range:\n\(formatter2.string(from: dateRange.start)) to \(formatter2.string(from: dateRange.end))\nFor index Path: \(indexPath)"
+    }
 }
 
 
diff --git a/SampleJTAppleCalendar/Main.storyboard b/SampleJTAppleCalendar/Main.storyboard
index 2c0eb425..7d532dd4 100644
--- a/SampleJTAppleCalendar/Main.storyboard
+++ b/SampleJTAppleCalendar/Main.storyboard
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="9v8-0V-uqf">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="9v8-0V-uqf">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
-        <!--Ib Calendar Data Source-->
+        <!--Calendar Layouts-->
         <scene sceneID="tne-QT-ifu">
             <objects>
                 <viewController automaticallyAdjustsScrollViewInsets="NO" id="BYZ-38-t0r" customClass="ViewController" customModule="SampleJTAppleCalendar" customModuleProvider="target" sceneMemberID="viewController">
@@ -21,7 +22,7 @@
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="30" translatesAutoresizingMaskIntoConstraints="NO" id="sua-xp-Lel">
                                 <rect key="frame" x="73.5" y="88" width="90" height="48"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="o4x-CL-uDB">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="o4x-CL-uDB">
                                         <rect key="frame" x="0.0" y="0.0" width="30" height="48"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="30"/>
                                         <state key="normal" title="&lt;"/>
@@ -29,7 +30,7 @@
                                             <action selector="previous:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Ltl-hs-ak9"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9V1-Fk-CiX">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9V1-Fk-CiX">
                                         <rect key="frame" x="60" y="0.0" width="30" height="48"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="30"/>
                                         <state key="normal" title="&gt;"/>
@@ -88,13 +89,13 @@
                                                                     </variation>
                                                                 </view>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hcf-AU-Etn">
-                                                                    <rect key="frame" x="32.5" y="35" width="50.5" height="21.5"/>
+                                                                    <rect key="frame" x="32.5" y="35" width="50" height="21.5"/>
                                                                     <fontDescription key="fontDescription" type="system" weight="black" pointSize="18"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="trP-HR-Ph0">
-                                                                    <rect key="frame" x="73" y="70.5" width="42" height="20.5"/>
+                                                                    <rect key="frame" x="73.5" y="70.5" width="41.5" height="20.5"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
@@ -127,7 +128,7 @@
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZeE-2j-jod">
-                                                            <rect key="frame" x="4" y="115" width="42" height="20.5"/>
+                                                            <rect key="frame" x="4.5" y="115" width="41.5" height="20.5"/>
                                                             <color key="backgroundColor" red="0.20392156859999999" green="0.59607843140000005" blue="0.85882352939999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                             <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -164,7 +165,7 @@
                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="aZd-el-ynv">
                                                 <rect key="frame" x="0.0" y="0.0" width="426" height="50"/>
                                                 <subviews>
-                                                    <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iq5-na-Ibe">
+                                                    <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iq5-na-Ibe">
                                                         <rect key="frame" x="0.0" y="0.0" width="83" height="50"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="numOfRows"/>
@@ -174,7 +175,7 @@
                                                             </userDefinedRuntimeAttribute>
                                                         </userDefinedRuntimeAttributes>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ykE-Ba-EbA">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ykE-Ba-EbA">
                                                         <rect key="frame" x="103" y="0.0" width="30" height="50"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="1"/>
@@ -187,7 +188,7 @@
                                                             <action selector="changeToRow:" destination="BYZ-38-t0r" eventType="touchUpInside" id="LcP-YZ-L7B"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cDl-9c-uWn">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cDl-9c-uWn">
                                                         <rect key="frame" x="153" y="0.0" width="30" height="50"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="2"/>
@@ -200,7 +201,7 @@
                                                             <action selector="changeToRow:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Eet-to-htT"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pb9-XQ-mrA">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pb9-XQ-mrA">
                                                         <rect key="frame" x="203" y="0.0" width="30" height="50"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="3"/>
@@ -213,7 +214,7 @@
                                                             <action selector="changeToRow:" destination="BYZ-38-t0r" eventType="touchUpInside" id="bDV-6L-J94"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="owT-zj-Nux">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="owT-zj-Nux">
                                                         <rect key="frame" x="253" y="0.0" width="30" height="50"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="6"/>
@@ -234,7 +235,7 @@
                                             <stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="iXK-tz-k0E">
                                                 <rect key="frame" x="0.0" y="55" width="279" height="50"/>
                                                 <subviews>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PyG-Eu-ygd">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PyG-Eu-ygd">
                                                         <rect key="frame" x="0.0" y="0.0" width="135" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="Inside Headers OFF"/>
@@ -247,7 +248,7 @@
                                                             <action selector="toggleInsideHeaders:" destination="BYZ-38-t0r" eventType="touchUpInside" id="4X6-3J-TpX"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PTy-sv-Bef">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PTy-sv-Bef">
                                                         <rect key="frame" x="145" y="0.0" width="134" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="Outside Header ON"/>
@@ -265,7 +266,7 @@
                                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" alignment="top" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Pm2-qg-gpi">
                                                 <rect key="frame" x="0.0" y="110" width="304" height="50"/>
                                                 <subviews>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UmE-fw-ixS">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UmE-fw-ixS">
                                                         <rect key="frame" x="0.0" y="0.0" width="147" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="Scrolling = Horizontal"/>
@@ -278,7 +279,7 @@
                                                             <action selector="changeDirection:" destination="BYZ-38-t0r" eventType="touchUpInside" id="sZt-zj-FDp"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1zj-vb-Qsa">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1zj-vb-Qsa">
                                                         <rect key="frame" x="157" y="0.0" width="147" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="StrictBoundary"/>
@@ -302,7 +303,7 @@
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vdq-Qe-RXg">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vdq-Qe-RXg">
                                                         <rect key="frame" x="41" y="0.0" width="30" height="30"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="First"/>
@@ -315,7 +316,7 @@
                                                             <action selector="inDateGeneration:" destination="BYZ-38-t0r" eventType="touchUpInside" id="9Vl-us-QH4"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pqT-rR-7vp">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pqT-rR-7vp">
                                                         <rect key="frame" x="81" y="0.0" width="30" height="30"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="All"/>
@@ -328,7 +329,7 @@
                                                             <action selector="inDateGeneration:" destination="BYZ-38-t0r" eventType="touchUpInside" id="aBo-kX-z49"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8W7-z1-FLL">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8W7-z1-FLL">
                                                         <rect key="frame" x="121" y="0.0" width="30" height="30"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="Off"/>
@@ -347,7 +348,7 @@
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pY3-9l-obO">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pY3-9l-obO">
                                                         <rect key="frame" x="215" y="0.0" width="30" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="EOR"/>
@@ -360,7 +361,7 @@
                                                             <action selector="outDateGeneration:" destination="BYZ-38-t0r" eventType="touchUpInside" id="mN9-3x-QXB"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UFs-LS-ELE">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UFs-LS-ELE">
                                                         <rect key="frame" x="255" y="0.0" width="32" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="EOG"/>
@@ -373,7 +374,7 @@
                                                             <action selector="outDateGeneration:" destination="BYZ-38-t0r" eventType="touchUpInside" id="T24-Gw-0LP"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lIg-Y1-ODc">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lIg-Y1-ODc">
                                                         <rect key="frame" x="297" y="0.0" width="30" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="OFF"/>
@@ -389,9 +390,9 @@
                                                 </subviews>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Ymv-Lj-fCZ">
-                                                <rect key="frame" x="0.0" y="220" width="332" height="50"/>
+                                                <rect key="frame" x="0.0" y="220" width="331" height="50"/>
                                                 <subviews>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UT2-lS-bfU">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UT2-lS-bfU">
                                                         <rect key="frame" x="0.0" y="0.0" width="42" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="+iSize"/>
@@ -404,7 +405,7 @@
                                                             <action selector="increaseItemSize:" destination="BYZ-38-t0r" eventType="touchUpInside" id="Etm-Hs-Zr7"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QjJ-we-IeA">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QjJ-we-IeA">
                                                         <rect key="frame" x="52" y="0.0" width="40" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="-iSize"/>
@@ -417,8 +418,8 @@
                                                             <action selector="decreaseItemSize:" destination="BYZ-38-t0r" eventType="touchUpInside" id="boh-Mi-Gj8"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s8M-i8-V2G">
-                                                        <rect key="frame" x="102" y="0.0" width="52" height="30"/>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s8M-i8-V2G">
+                                                        <rect key="frame" x="102" y="0.0" width="51" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="+cInset"/>
                                                         <userDefinedRuntimeAttributes>
@@ -430,8 +431,8 @@
                                                             <action selector="increaseCellInset:" destination="BYZ-38-t0r" eventType="touchUpInside" id="RzB-dh-gyz"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lTu-1d-FMQ">
-                                                        <rect key="frame" x="164" y="0.0" width="49" height="30"/>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lTu-1d-FMQ">
+                                                        <rect key="frame" x="163" y="0.0" width="49" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="-cInset"/>
                                                         <userDefinedRuntimeAttributes>
@@ -443,8 +444,8 @@
                                                             <action selector="decreaseCellInset:" destination="BYZ-38-t0r" eventType="touchUpInside" id="aA6-Kb-DWf"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7P9-mg-F0x">
-                                                        <rect key="frame" x="223" y="0.0" width="51" height="30"/>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7P9-mg-F0x">
+                                                        <rect key="frame" x="222" y="0.0" width="51" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="+sInset"/>
                                                         <userDefinedRuntimeAttributes>
@@ -456,8 +457,8 @@
                                                             <action selector="increaseSectionInset:" destination="BYZ-38-t0r" eventType="touchUpInside" id="QIG-Tv-j7A"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="J08-1K-kyP">
-                                                        <rect key="frame" x="284" y="0.0" width="48" height="30"/>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="J08-1K-kyP">
+                                                        <rect key="frame" x="283" y="0.0" width="48" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="-sInset"/>
                                                         <userDefinedRuntimeAttributes>
@@ -474,7 +475,7 @@
                                             <stackView opaque="NO" contentMode="scaleToFill" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="JUA-it-04n">
                                                 <rect key="frame" x="0.0" y="275" width="293" height="50"/>
                                                 <subviews>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xa9-2t-dk2">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xa9-2t-dk2">
                                                         <rect key="frame" x="0.0" y="0.0" width="45" height="50"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="Resize"/>
@@ -487,7 +488,7 @@
                                                             <action selector="resize:" destination="BYZ-38-t0r" eventType="touchUpInside" id="z3U-sg-ISt"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wy0-di-wch">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wy0-di-wch">
                                                         <rect key="frame" x="49" y="0.0" width="98" height="50"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="show pre/post"/>
@@ -500,7 +501,7 @@
                                                             <action selector="showPrepost:" destination="BYZ-38-t0r" eventType="touchUpInside" id="hNx-Ag-o7h"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="caD-EO-Q2H">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="caD-EO-Q2H">
                                                         <rect key="frame" x="151" y="0.0" width="91" height="50"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="hide pre/post"/>
@@ -513,7 +514,7 @@
                                                             <action selector="hidePrepost:" destination="BYZ-38-t0r" eventType="touchUpInside" id="6Yo-mk-p8C"/>
                                                         </connections>
                                                     </button>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hva-aw-jhb">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hva-aw-jhb">
                                                         <rect key="frame" x="246" y="0.0" width="47" height="50"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="Reload"/>
@@ -531,7 +532,7 @@
                                             <stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="GrB-Ci-kGG">
                                                 <rect key="frame" x="0.0" y="330" width="179" height="50"/>
                                                 <subviews>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lhy-8Z-vQ5">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lhy-8Z-vQ5">
                                                         <rect key="frame" x="0.0" y="0.0" width="137" height="30"/>
                                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                                         <state key="normal" title="Change scroll Mode"/>
@@ -554,7 +555,7 @@
                                             <stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="iZb-9u-P1u">
                                                 <rect key="frame" x="0.0" y="385" width="123" height="50"/>
                                                 <subviews>
-                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pWe-Sy-KRu">
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pWe-Sy-KRu">
                                                         <rect key="frame" x="0.0" y="0.0" width="123" height="28"/>
                                                         <color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="calibratedWhite"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
@@ -706,7 +707,7 @@
             </objects>
             <point key="canvasLocation" x="1281" y="245"/>
         </scene>
-        <!--Ib Calendar Data Source-->
+        <!--Test Range Selection View Controller-->
         <scene sceneID="cAw-IR-4gx">
             <objects>
                 <viewController id="JjC-p2-LPZ" customClass="TestRangeSelectionViewController" customModule="SampleJTAppleCalendar" customModuleProvider="target" sceneMemberID="viewController">
@@ -722,7 +723,7 @@
                                 <rect key="frame" x="0.0" y="88" width="414" height="370.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ojx-JA-J5N">
-                                        <rect key="frame" x="186" y="0.0" width="42" height="20.5"/>
+                                        <rect key="frame" x="186.5" y="0.0" width="41.5" height="20.5"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -752,7 +753,7 @@
                                                             <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         </view>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eil-Oq-XKz">
-                                                            <rect key="frame" x="62.5" y="72" width="42" height="20.5"/>
+                                                            <rect key="frame" x="63" y="72" width="41.5" height="20.5"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                             <nil key="textColor"/>
                                                             <nil key="highlightedColor"/>
@@ -834,11 +835,11 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" verticalHuggingPriority="249" verticalCompressionResistancePriority="751" translatesAutoresizingMaskIntoConstraints="NO" id="dkg-wL-Ol1" customClass="JTACCellMonthView" customModule="JTAppleCalendar">
-                                                    <rect key="frame" x="0.0" y="24" width="156" height="111"/>
+                                                    <rect key="frame" x="0.0" y="23.5" width="156" height="111.5"/>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 </view>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="Jan" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e8x-Rc-HXw">
-                                                    <rect key="frame" x="0.0" y="0.0" width="29" height="21"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="29" height="20.5"/>
                                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                                     <color key="textColor" red="1" green="0.30872617429999999" blue="0.17401843089999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -888,16 +889,40 @@
                                     <outlet property="ibCalendarDelegate" destination="pke-tV-doL" id="Ah0-gC-2nn"/>
                                 </connections>
                             </collectionView>
+                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="32" translatesAutoresizingMaskIntoConstraints="NO" id="T51-b4-Ofr">
+                                <rect key="frame" x="20" y="496" width="374" height="358"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UuR-GF-dOF">
+                                        <rect key="frame" x="0.0" y="0.0" width="374" height="163"/>
+                                        <state key="normal" title="Scroll To Today"/>
+                                        <connections>
+                                            <action selector="scrollToToday:" destination="ZZU-Fx-N6U" eventType="touchUpInside" id="6yX-MY-aIP"/>
+                                        </connections>
+                                    </button>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aDa-iR-9aC">
+                                        <rect key="frame" x="0.0" y="195" width="374" height="163"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <nil key="textColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                            </stackView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
+                            <constraint firstItem="T51-b4-Ofr" firstAttribute="top" secondItem="Bh9-Ea-ItT" secondAttribute="bottom" constant="8" symbolic="YES" id="HVA-iy-jsn"/>
                             <constraint firstItem="Bh9-Ea-ItT" firstAttribute="leading" secondItem="pke-tV-doL" secondAttribute="leading" id="Jcr-c1-TdX"/>
+                            <constraint firstItem="cEM-w5-hoy" firstAttribute="top" secondItem="T51-b4-Ofr" secondAttribute="bottom" constant="8" symbolic="YES" id="LjR-Gu-mKJ"/>
                             <constraint firstAttribute="trailing" secondItem="Bh9-Ea-ItT" secondAttribute="trailing" id="Lmm-gS-Rmd"/>
                             <constraint firstItem="Bh9-Ea-ItT" firstAttribute="top" secondItem="E2D-gB-4ry" secondAttribute="bottom" id="XNa-ln-pMt"/>
+                            <constraint firstItem="T51-b4-Ofr" firstAttribute="leading" secondItem="pke-tV-doL" secondAttribute="leadingMargin" id="h5d-Vc-6dv"/>
+                            <constraint firstItem="T51-b4-Ofr" firstAttribute="trailing" secondItem="pke-tV-doL" secondAttribute="trailingMargin" id="qoc-D6-ntR"/>
                         </constraints>
                     </view>
                     <connections>
                         <outlet property="calendarView" destination="Bh9-Ea-ItT" id="hyM-gA-pgb"/>
+                        <outlet property="monthSelectLabel" destination="aDa-iR-9aC" id="kn6-Ag-Dqo"/>
+                        <outlet property="scrollToTodayButton" destination="UuR-GF-dOF" id="QEI-us-qOb"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="vQa-iq-XYe" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -919,35 +944,35 @@
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="wFg-I5-5WX">
                                 <rect key="frame" x="95.5" y="373" width="223" height="150"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="r9b-Va-H2a">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="r9b-Va-H2a">
                                         <rect key="frame" x="0.0" y="0.0" width="223" height="30"/>
                                         <state key="normal" title="Calendar Layouts demonstration"/>
                                         <connections>
                                             <segue destination="BYZ-38-t0r" kind="show" id="HXg-uq-MHf"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2W1-xT-Tgg">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2W1-xT-Tgg">
                                         <rect key="frame" x="0.0" y="30" width="223" height="30"/>
                                         <state key="normal" title="testing resizing/ Orientation"/>
                                         <connections>
                                             <segue destination="AVg-Nb-61y" kind="show" id="h9Y-WS-r0J"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fae-HY-XpN">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fae-HY-XpN">
                                         <rect key="frame" x="0.0" y="60" width="223" height="30"/>
                                         <state key="normal" title="Persian Calendar"/>
                                         <connections>
                                             <segue destination="HlD-js-bve" kind="show" id="4D4-Ys-Mko"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IYU-1e-f9F">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="IYU-1e-f9F">
                                         <rect key="frame" x="0.0" y="90" width="223" height="30"/>
                                         <state key="normal" title="Range selection"/>
                                         <connections>
                                             <segue destination="JjC-p2-LPZ" kind="show" id="XsD-qK-5c0"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yTB-iP-SZo">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yTB-iP-SZo">
                                         <rect key="frame" x="0.0" y="120" width="223" height="30"/>
                                         <state key="normal" title="YearView Calendar"/>
                                         <connections>
@@ -969,7 +994,7 @@
             </objects>
             <point key="canvasLocation" x="2012" y="244"/>
         </scene>
-        <!--Ib Calendar Data Source-->
+        <!--Test View Controller-->
         <scene sceneID="Xh3-HE-cqu">
             <objects>
                 <viewController id="AVg-Nb-61y" customClass="TestViewController" customModule="SampleJTAppleCalendar" customModuleProvider="target" sceneMemberID="viewController">
@@ -1002,7 +1027,7 @@
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="date" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7qW-Ip-gdz">
-                                                            <rect key="frame" x="59.5" y="56.5" width="34.5" height="20.5"/>
+                                                            <rect key="frame" x="59.5" y="56.5" width="34" height="20.5"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                             <nil key="textColor"/>
                                                             <nil key="highlightedColor"/>
@@ -1042,21 +1067,21 @@
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="TU3-e8-jQU">
                                 <rect key="frame" x="20" y="400" width="374" height="30"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mT9-sa-CDD">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mT9-sa-CDD">
                                         <rect key="frame" x="0.0" y="0.0" width="118" height="30"/>
                                         <state key="normal" title="2 heightCal"/>
                                         <connections>
                                             <action selector="twoHeight:" destination="AVg-Nb-61y" eventType="touchUpInside" id="wfF-Rx-Opp"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7iF-QA-fsa">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7iF-QA-fsa">
                                         <rect key="frame" x="128" y="0.0" width="118" height="30"/>
                                         <state key="normal" title="200 HeightCal"/>
                                         <connections>
                                             <action selector="twoHundredHeight:" destination="AVg-Nb-61y" eventType="touchUpInside" id="U1z-Me-iZW"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nO2-WK-qB5">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nO2-WK-qB5">
                                         <rect key="frame" x="256" y="0.0" width="118" height="30"/>
                                         <state key="normal" title="0 heightCal"/>
                                         <connections>
@@ -1068,21 +1093,21 @@
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="bqS-br-Qs5">
                                 <rect key="frame" x="0.0" y="430" width="414" height="30"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e3X-PP-Mqx">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e3X-PP-Mqx">
                                         <rect key="frame" x="0.0" y="0.0" width="131.5" height="30"/>
                                         <state key="normal" title="2 heightV"/>
                                         <connections>
                                             <action selector="twoHeightView:" destination="AVg-Nb-61y" eventType="touchUpInside" id="ywc-pJ-Lfg"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2yq-DP-rjS">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2yq-DP-rjS">
                                         <rect key="frame" x="141.5" y="0.0" width="131" height="30"/>
                                         <state key="normal" title="200 HeightV"/>
                                         <connections>
                                             <action selector="twoHundredHeightView:" destination="AVg-Nb-61y" eventType="touchUpInside" id="L8R-ga-lsE"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3rt-Bl-Rl9">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3rt-Bl-Rl9">
                                         <rect key="frame" x="282.5" y="0.0" width="131.5" height="30"/>
                                         <state key="normal" title="0 heightV"/>
                                         <connections>
@@ -1146,7 +1171,7 @@
                                 </subviews>
                             </stackView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d9e-9A-w1w">
-                                <rect key="frame" x="186" y="88" width="42" height="20.5"/>
+                                <rect key="frame" x="186.5" y="88" width="41.5" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -1154,21 +1179,21 @@
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="ULx-90-n0y">
                                 <rect key="frame" x="20" y="460" width="374" height="30"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="he5-OD-oBh">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="he5-OD-oBh">
                                         <rect key="frame" x="0.0" y="0.0" width="124.5" height="30"/>
                                         <state key="normal" title="Resizing inside TabBar"/>
                                         <connections>
                                             <segue destination="9Vk-ez-fic" kind="show" id="d4V-XS-ToU"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HK3-rn-nG9">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HK3-rn-nG9">
                                         <rect key="frame" x="124.5" y="0.0" width="125" height="30"/>
                                         <state key="normal" title="reload"/>
                                         <connections>
                                             <action selector="reload:" destination="AVg-Nb-61y" eventType="touchUpInside" id="Kek-GF-ofn"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="F5Z-I4-eWm">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="F5Z-I4-eWm">
                                         <rect key="frame" x="249.5" y="0.0" width="124.5" height="30"/>
                                         <state key="normal" title="DebugThis"/>
                                         <connections>
@@ -1180,21 +1205,21 @@
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="HBe-aT-7IQ">
                                 <rect key="frame" x="20" y="490" width="394" height="30"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hAY-Ma-dSs">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hAY-Ma-dSs">
                                         <rect key="frame" x="0.0" y="0.0" width="131.5" height="30"/>
                                         <state key="normal" title="select1Date"/>
                                         <connections>
                                             <action selector="selectOneDate:" destination="AVg-Nb-61y" eventType="touchUpInside" id="MSw-ce-TAS"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a3c-kq-fCK">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a3c-kq-fCK">
                                         <rect key="frame" x="131.5" y="0.0" width="131" height="30"/>
                                         <state key="normal" title="SelectODate"/>
                                         <connections>
                                             <action selector="selectOtherDate:" destination="AVg-Nb-61y" eventType="touchUpInside" id="tJW-Lw-m1V"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dHk-d9-jd7">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dHk-d9-jd7">
                                         <rect key="frame" x="262.5" y="0.0" width="131.5" height="30"/>
                                         <state key="normal" title="Select1Month"/>
                                         <connections>
@@ -1206,21 +1231,21 @@
                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="Hwj-Wy-zs2">
                                 <rect key="frame" x="20" y="520" width="374" height="30"/>
                                 <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bJf-bb-Owh">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bJf-bb-Owh">
                                         <rect key="frame" x="0.0" y="0.0" width="124.5" height="30"/>
                                         <state key="normal" title="selectABunch"/>
                                         <connections>
                                             <action selector="selectABunch:" destination="AVg-Nb-61y" eventType="touchUpInside" id="QEQ-qK-fvG"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AuZ-wk-d5r">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AuZ-wk-d5r">
                                         <rect key="frame" x="124.5" y="0.0" width="125" height="30"/>
                                         <state key="normal" title="singleSelect"/>
                                         <connections>
                                             <action selector="singleSelect:" destination="AVg-Nb-61y" eventType="touchUpInside" id="Bnm-xU-BWj"/>
                                         </connections>
                                     </button>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="o1T-jC-TEI">
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="o1T-jC-TEI">
                                         <rect key="frame" x="249.5" y="0.0" width="124.5" height="30"/>
                                         <state key="normal" title="multiSelect"/>
                                         <connections>
diff --git a/Sources/JTAppleCalendar/JTACCollectionYearViewDelegates.swift b/Sources/JTAppleCalendar/JTACCollectionYearViewDelegates.swift
index c8bd4144..147dc68a 100644
--- a/Sources/JTAppleCalendar/JTACCollectionYearViewDelegates.swift
+++ b/Sources/JTAppleCalendar/JTACCollectionYearViewDelegates.swift
@@ -82,4 +82,22 @@ extension JTACYearView: UICollectionViewDelegate, UICollectionViewDataSource, UI
         }
         return size
     }
+    
+    public func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        guard let delegate = calendarDelegate else {
+            print("No delegate configured")
+            return
+        }
+        
+        if(monthData.isEmpty || indexPath.row >= monthData.count) {
+            print("Desired index path: \(indexPath) is larger than displayed data")
+        }
+        
+        if let month = monthData[indexPath.row] as? Month {
+            let firstDate = self.findFirstMonthCellDate(cellIndex: indexPath.row, monthData: monthData)
+            let days = month.numberOfDaysInMonth
+            let endDate = configurationParameters.calendar.date(byAdding: .day, value: days - 1, to: firstDate) ?? configurationParameters.endDate
+            delegate.calendar(self, didSelectMonth: month, dateRange: (firstDate, endDate), cell: self.cellForItem(at: indexPath) as? JTACMonthCell, indexPath: indexPath)
+        }
+    }
 }
diff --git a/Sources/JTAppleCalendar/JTACMonthCell.swift b/Sources/JTAppleCalendar/JTACMonthCell.swift
index cd0a2daf..c4d057d2 100644
--- a/Sources/JTAppleCalendar/JTACMonthCell.swift
+++ b/Sources/JTAppleCalendar/JTACMonthCell.swift
@@ -34,8 +34,8 @@ public protocol JTACCellMonthViewDelegate: AnyObject {
 }
 
 open class JTACMonthCell: UICollectionViewCell {
-    @IBOutlet var monthView: JTACCellMonthView?
-    weak var delegate: JTACCellMonthViewDelegate?
+    @IBOutlet open var monthView: JTACCellMonthView?
+    weak open var delegate: JTACCellMonthViewDelegate?
     
     func setupWith(configurationParameters: ConfigurationParameters,
                    month: Month,
diff --git a/Sources/JTAppleCalendar/JTACYearView.swift b/Sources/JTAppleCalendar/JTACYearView.swift
index 1181e620..5527b483 100644
--- a/Sources/JTAppleCalendar/JTACYearView.swift
+++ b/Sources/JTAppleCalendar/JTACYearView.swift
@@ -73,3 +73,36 @@ extension JTACYearView: JTACCellMonthViewDelegate {
         calendarDelegate?.calendar(self, monthView: monthView, drawingFor: segmentRect, with: date, dateOwner: dateOwner, monthIndex: monthIndex)
     }
 }
+
+extension JTACYearView {
+    
+    /// Scrolls the year view to display month that contains the date provided
+    public func scrollToDate(_ date: Date, at: UICollectionView.ScrollPosition, animated: Bool) {
+        if let index = self.findCellIndexMatchingDate(desiredDate: date, monthData: monthData) {
+            self.scrollToItem(at: IndexPath(row: index, section: 0), at: at, animated: animated)
+        }
+    }
+    
+    func findCellIndexMatchingDate(desiredDate:Date, monthData: [Any]) -> Int? {
+        var retval:Int? = nil
+        let desiredParameters = configurationParameters.calendar.dateComponents([.month, .year], from: desiredDate)
+
+        for month in monthData {
+            if let month = month as? Month {
+                guard let date = configurationParameters.calendar.date(byAdding: .month, value: month.index, to: configurationParameters.startDate) else {
+                    print("Invalid startup parameters. Cannot find index for date: \(desiredDate)")
+                    assert(false)
+                    return nil
+                }
+                let currentParameters = configurationParameters.calendar.dateComponents([.month, .year], from: date)
+
+                if(desiredParameters.month == currentParameters.month && desiredParameters.year == currentParameters.year) {
+                    retval = month.index
+                    break
+                }
+            }
+        }
+        
+        return retval
+    }
+}
diff --git a/Sources/JTAppleCalendar/JTACYearViewProtocols.swift b/Sources/JTAppleCalendar/JTACYearViewProtocols.swift
index 15a41b9a..fb76f006 100644
--- a/Sources/JTAppleCalendar/JTACYearViewProtocols.swift
+++ b/Sources/JTAppleCalendar/JTACYearViewProtocols.swift
@@ -34,9 +34,12 @@ public protocol JTACYearViewDelegate: AnyObject {
                   dateOwner: DateOwner,
                   monthIndex index: Int)
     func calendar(_ calendar: JTACYearView, sizeFor item: Any) -> CGSize
+    
+    func calendar(_ calendar: JTACYearView, didSelectMonth month: Month, dateRange: (start:Date, end:Date), cell: JTACMonthCell?, indexPath: IndexPath)
+
 }
 
-extension JTACYearViewDelegate {
+public extension JTACYearViewDelegate {
     func calendar(_ calendar: JTACYearView,
                   monthView: JTACCellMonthView,
                   drawingFor segmentRect: CGRect,
@@ -44,6 +47,9 @@ extension JTACYearViewDelegate {
                   dateOwner: DateOwner,
                   monthIndex index: Int){}
     func calendar(_ calendar: JTACYearView, sizeFor item: Any) -> CGSize { return .zero }
+    
+    func calendar(_ calendar: JTACYearView, didSelectMonth month: Month,  dateRange: (start:Date, end:Date), cell: JTACMonthCell?, indexPath: IndexPath){}
+
 }
 
 public protocol JTACYearViewDataSource: AnyObject {