diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 515e24ee..900edec2 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -454,6 +454,12 @@
 				D29DF31F21ED0CBA003B2FB9 /* LabelView.m */,
 				D29DF15921E697DA003B2FB9 /* SeparatorView.h */,
 				D29DF15A21E697DA003B2FB9 /* SeparatorView.m */,
+				D22D1F1C220343560077CEC0 /* MVMCoreUICheckMarkView.h */,
+				D22D1F1D220343560077CEC0 /* MVMCoreUICheckMarkView.m */,
+				D22D1F18220341F50077CEC0 /* MVMCoreUICheckBox.h */,
+				D22D1F19220341F50077CEC0 /* MVMCoreUICheckBox.m */,
+				0198F7A02256A80A0066C936 /* MFRadioButton.h */,
+				0198F7A22256A80A0066C936 /* MFRadioButton.m */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -764,16 +770,10 @@
 				D29DF32221ED0DA2003B2FB9 /* TextButtonView.m */,
 				D29770FB21F7C77400B2F0D0 /* MVMCoreUITextFieldView.h */,
 				D29770FA21F7C77400B2F0D0 /* MVMCoreUITextFieldView.m */,
-				D22D1F1C220343560077CEC0 /* MVMCoreUICheckMarkView.h */,
-				D22D1F1D220343560077CEC0 /* MVMCoreUICheckMarkView.m */,
-				D22D1F18220341F50077CEC0 /* MVMCoreUICheckBox.h */,
-				D22D1F19220341F50077CEC0 /* MVMCoreUICheckBox.m */,
 				D22D1F44220496A30077CEC0 /* MVMCoreUISwitch.h */,
 				D22D1F45220496A30077CEC0 /* MVMCoreUISwitch.m */,
 				DBC4391C2245232D001AB423 /* LabelWithInternalButton.swift */,
 				DB891E822253FA8500022516 /* Label.swift */,
-				0198F7A02256A80A0066C936 /* MFRadioButton.h */,
-				0198F7A22256A80A0066C936 /* MFRadioButton.m */,
 				0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */,
 				0A7BAFA2232BE63400FB8E22 /* CheckboxWithLabelView.swift */,
 				01004F2F22721C3800991ECC /* RadioButton.swift */,
diff --git a/MVMCoreUI/Atoms/Views/MFRadioButton.h b/MVMCoreUI/Legacy/Views/MFRadioButton.h
similarity index 100%
rename from MVMCoreUI/Atoms/Views/MFRadioButton.h
rename to MVMCoreUI/Legacy/Views/MFRadioButton.h
diff --git a/MVMCoreUI/Atoms/Views/MFRadioButton.m b/MVMCoreUI/Legacy/Views/MFRadioButton.m
similarity index 100%
rename from MVMCoreUI/Atoms/Views/MFRadioButton.m
rename to MVMCoreUI/Legacy/Views/MFRadioButton.m
diff --git a/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.h b/MVMCoreUI/Legacy/Views/MVMCoreUICheckBox.h
similarity index 100%
rename from MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.h
rename to MVMCoreUI/Legacy/Views/MVMCoreUICheckBox.h
diff --git a/MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m b/MVMCoreUI/Legacy/Views/MVMCoreUICheckBox.m
similarity index 100%
rename from MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m
rename to MVMCoreUI/Legacy/Views/MVMCoreUICheckBox.m
diff --git a/MVMCoreUI/Atoms/Views/MVMCoreUICheckMarkView.h b/MVMCoreUI/Legacy/Views/MVMCoreUICheckMarkView.h
similarity index 100%
rename from MVMCoreUI/Atoms/Views/MVMCoreUICheckMarkView.h
rename to MVMCoreUI/Legacy/Views/MVMCoreUICheckMarkView.h
diff --git a/MVMCoreUI/Atoms/Views/MVMCoreUICheckMarkView.m b/MVMCoreUI/Legacy/Views/MVMCoreUICheckMarkView.m
similarity index 100%
rename from MVMCoreUI/Atoms/Views/MVMCoreUICheckMarkView.m
rename to MVMCoreUI/Legacy/Views/MVMCoreUICheckMarkView.m
diff --git a/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift b/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
index 518e3b51..31a6cc61 100644
--- a/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
+++ b/MVMCoreUI/Molecules/Items/DropDownFilterTableViewCell.swift
@@ -33,7 +33,7 @@ import UIKit
             options: [.old, .new]
         ) { [weak self] object, change in
             guard change.newValue != change.oldValue, let self = self,
-                let options = self.dropDown?.json?.optionalArrayForKey(KeyValue) as? [NSString],
+                let options = self.dropDown?.json?.optionalArrayForKey("options") as? [NSString],
                 let index = options.firstIndex(of: change.newValue!! as NSString),
                 let moleculesArrays = self.json?.arrayForKey(KeyMolecules) as? [[[AnyHashable: Any]]] else { return }
             
diff --git a/MVMCoreUI/Organisms/MoleculeStackView.swift b/MVMCoreUI/Organisms/MoleculeStackView.swift
index cafe21b0..dc7cc81e 100644
--- a/MVMCoreUI/Organisms/MoleculeStackView.swift
+++ b/MVMCoreUI/Organisms/MoleculeStackView.swift
@@ -264,7 +264,7 @@ public class MoleculeStackView: ViewConstrainingView {
             } else if let previousView = items.last(where: { stackItem in
                 return !stackItem.gone
             })?.view {
-                _ = NSLayoutConstraint(pinFirstView: previousView, toSecondView: view, withConstant: spacing, directionVertical: true)
+                view.topAnchor.constraint(equalTo: previousView.bottomAnchor, constant: spacing).isActive = true
             }
             pinView(view, toView: contentView, attribute: .leading, relation: .equal, priority: .required, constant: 0)
             pinView(contentView, toView: view, attribute: .trailing, relation: .equal, priority: .required, constant: 0)
@@ -281,7 +281,7 @@ public class MoleculeStackView: ViewConstrainingView {
             } else if let previousView = items.last(where: { stackItem in
                 return !stackItem.gone
             })?.view {
-                _ = NSLayoutConstraint(pinFirstView: previousView, toSecondView: view, withConstant: spacing, directionVertical: false)
+                view.leftAnchor.constraint(equalTo: previousView.rightAnchor, constant: spacing).isActive = true
             }
             pinView(view, toView: contentView, attribute: .top, relation: .equal, priority: .required, constant: 0)
             pinView(contentView, toView: view, attribute: .bottom, relation: .equal, priority: .required, constant: 0)