     open override func viewDidLoad() {
         super.viewDidLoad()
         
+        // Take up the whole view when pushed from a navigation controller
+        if navigationController != nil {
+            optionLayoutWidthRatio = 1
+            optionLayoutHeightRatio = 1
+        }
+        
         // Add background
-        let background = UIVisualEffectView(effect: UIBlurEffect(style: optionStyleBlurEffect))
+        let background: UIView
+        if navigationController != nil {
+            background = UIView()
+            background.backgroundColor = UIColor.white
+        } else {
+            background = UIVisualEffectView(effect: UIBlurEffect(style: optionStyleBlurEffect))
+        }
         background.translatesAutoresizingMaskIntoConstraints = false
         view.insertSubview(background, at: 0)
         view.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "H:|[bg]|", options: [], metrics: nil, views: ["bg": background]))

        case .range:
            del?.WWCalendarTimeSelectorDone?(picker, dates: optionCurrentDateRange.array)
        }
        del?.WWCalendarTimeSelectorWillDismiss?(picker)
        dismiss(animated: true) {
            del?.WWCalendarTimeSelectorDidDismiss?(picker)
        }
    }
    

        else {
            del?.WWCalendarTimeSelectorCancel?(picker, dates: multipleDates)
        }
        dismiss()
    }
    
    @IBAction func done() {
