diff --git a/VDSSample/ViewControllers/CalendarViewController.swift b/VDSSample/ViewControllers/CalendarViewController.swift
index 680f9f2..a2ae7a7 100644
--- a/VDSSample/ViewControllers/CalendarViewController.swift
+++ b/VDSSample/ViewControllers/CalendarViewController.swift
@@ -13,7 +13,7 @@ import VDSTokens
 
 class CalendarViewController: BaseViewController<CalendarBase> {
     
-    var borderSwitch = Toggle()
+    var containerBorderSwitch = Toggle()
     var dateIndicatorSwitch = Toggle()
     var transparentSwitch = Toggle()
     var indicatorOneSwitch = Toggle()
@@ -31,7 +31,7 @@ class CalendarViewController: BaseViewController<CalendarBase> {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        addContentTopView(view: component)        
+        addContentTopView(view: component)
         setupPicker()
         setupModel()
     }
@@ -56,7 +56,7 @@ class CalendarViewController: BaseViewController<CalendarBase> {
         
         //add form rows
         addFormRow(label: "Surface", view: surfacePickerSelectorView)
-        addFormRow(label: "Hide Container Border", view: borderSwitch)
+        addFormRow(label: "Hide Container Border", view: containerBorderSwitch)
         addFormRow(label: "Hide Current Date Indicator", view: dateIndicatorSwitch)
         addFormRow(label: "Min Date", view: minDateField)
         addFormRow(label: "Max Date", view: maxDateField)
@@ -71,6 +71,11 @@ class CalendarViewController: BaseViewController<CalendarBase> {
         addFormRow(label: "Indicator Two Date", view: datePickerTwo)
         addFormRow(label: "Indicator Three Date", view: datePickerThree)
         
+        containerBorderSwitch.onChange = { [weak self] sender in
+            guard let self else { return }
+            component.hideContainerBorder = sender.isOn
+        }
+        
         legendOneField
             .textPublisher
             .sink {