diff --git a/VDSSample/ViewControllers/ModelScrollViewController.swift b/VDSSample/ViewControllers/ModelScrollViewController.swift
index fdb60f4..e021f60 100644
--- a/VDSSample/ViewControllers/ModelScrollViewController.swift
+++ b/VDSSample/ViewControllers/ModelScrollViewController.swift
@@ -15,6 +15,9 @@ public class ModelScrollViewController<ModelType: Modelable>: UIViewController,
         print("\(Self.self) deinit")
     }
     
+    private let edgeSpacing = 16.0
+    private let topBottomSpacing = 20.0
+
     //--------------------------------------------------
     // MARK: - Combine Properties
     //--------------------------------------------------
@@ -70,7 +73,11 @@ public class ModelScrollViewController<ModelType: Modelable>: UIViewController,
         }
     }
     
-    public var picker = UIPickerView()
+    public var picker: UIPickerView = {
+        return UIPickerView().with {
+            $0.translatesAutoresizingMaskIntoConstraints = false
+        }
+    }()
 
     public var contentStackView: UIStackView = {
         return UIStackView().with {
@@ -113,14 +120,13 @@ public class ModelScrollViewController<ModelType: Modelable>: UIViewController,
         contentStackView.addArrangedSubview(contentTopView)
         contentStackView.addArrangedSubview(contentBottomView)
         contentBottomView.addSubview(formStackView)
-        formStackView.translatesAutoresizingMaskIntoConstraints = false
-        formStackView.topAnchor.constraint(equalTo: contentBottomView.topAnchor, constant: 16).isActive = true
-        formStackView.leadingAnchor.constraint(equalTo: contentBottomView.leadingAnchor, constant: 16).isActive = true
-        formStackView.trailingAnchor.constraint(equalTo: contentBottomView.trailingAnchor, constant: -16).isActive = true
+
+        formStackView.topAnchor.constraint(equalTo: contentBottomView.topAnchor, constant: edgeSpacing).isActive = true
+        formStackView.leadingAnchor.constraint(equalTo: contentBottomView.leadingAnchor, constant: edgeSpacing).isActive = true
+        formStackView.trailingAnchor.constraint(equalTo: contentBottomView.trailingAnchor, constant: -edgeSpacing).isActive = true
         formStackView.bottomAnchor.constraint(equalTo: contentBottomView.bottomAnchor, constant: -150).isActive = true
 
         view.addSubview(picker)
-        picker.translatesAutoresizingMaskIntoConstraints = false
         picker.leadingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.leadingAnchor).isActive = true
         picker.trailingAnchor.constraint(equalTo: view.safeAreaLayoutGuide.trailingAnchor).isActive = true
         picker.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor).isActive = true
@@ -142,10 +148,10 @@ public class ModelScrollViewController<ModelType: Modelable>: UIViewController,
     
     open func addContentTopView(view: UIView) {
         contentTopView.addSubview(view)
-        view.leadingAnchor.constraint(equalTo: contentTopView.leadingAnchor, constant: 16).isActive = true
-        view.trailingAnchor.constraint(lessThanOrEqualTo: contentTopView.trailingAnchor, constant: -16).isActive = true
-        view.topAnchor.constraint(equalTo: contentTopView.topAnchor).isActive = true
-        view.bottomAnchor.constraint(equalTo: contentTopView.bottomAnchor).isActive = true
+        view.leadingAnchor.constraint(equalTo: contentTopView.leadingAnchor, constant: edgeSpacing).isActive = true
+        view.trailingAnchor.constraint(lessThanOrEqualTo: contentTopView.trailingAnchor, constant: -edgeSpacing).isActive = true
+        view.topAnchor.constraint(equalTo: contentTopView.topAnchor, constant: topBottomSpacing).isActive = true
+        view.bottomAnchor.constraint(equalTo: contentTopView.bottomAnchor, constant: -topBottomSpacing).isActive = true
     }
 
     open func addFormRow(label: String, view: UIView, stackView: UIStackView? = nil) {