diff --git a/MVMCoreUI/Atoms/Buttons/CaretButton.swift b/MVMCoreUI/Atoms/Buttons/CaretButton.swift
index b01d2758..6c9de088 100644
--- a/MVMCoreUI/Atoms/Buttons/CaretButton.swift
+++ b/MVMCoreUI/Atoms/Buttons/CaretButton.swift
@@ -136,7 +136,7 @@ open class CaretButton: MFCustomButton, MVMCoreUIMoleculeViewProtocol, MVMCoreUI
         return true
     }
     
-    open func alignment() -> UIStackView.Alignment {
+    open func horizontalAlignment() -> UIStackView.Alignment {
         return UIStackView.Alignment.leading;
     }
     
diff --git a/MVMCoreUI/Atoms/Buttons/MFTextButton.m b/MVMCoreUI/Atoms/Buttons/MFTextButton.m
index e1a6c504..a0ee6ca7 100644
--- a/MVMCoreUI/Atoms/Buttons/MFTextButton.m
+++ b/MVMCoreUI/Atoms/Buttons/MFTextButton.m
@@ -156,7 +156,7 @@
     return YES;
 }
 
-- (UIStackViewAlignment)alignment {
+- (UIStackViewAlignment)horizontalAlignment {
     return UIStackViewAlignmentLeading;
 }
 
diff --git a/MVMCoreUI/Atoms/Views/CaretView.swift b/MVMCoreUI/Atoms/Views/CaretView.swift
index b68d0535..9b500cdc 100644
--- a/MVMCoreUI/Atoms/Views/CaretView.swift
+++ b/MVMCoreUI/Atoms/Views/CaretView.swift
@@ -131,7 +131,7 @@ extension CaretView: MVMCoreUIViewConstrainingProtocol {
         return true
     }
     
-    open func alignment() -> UIStackView.Alignment {
+    open func horizontalAlignment() -> UIStackView.Alignment {
         return UIStackView.Alignment.leading;
     }
 }
diff --git a/MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift b/MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift
index f148863b..7ce1104e 100644
--- a/MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift
+++ b/MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift
@@ -165,7 +165,7 @@ extension CheckboxWithLabelView {
         layoutIfNeeded()
     }
     
-    override open func alignment() -> UIStackView.Alignment {
+    override open func horizontalAlignment() -> UIStackView.Alignment {
         return .leading
     }
     
diff --git a/MVMCoreUI/Atoms/Views/Label.swift b/MVMCoreUI/Atoms/Views/Label.swift
index 99a28463..56a0c38b 100644
--- a/MVMCoreUI/Atoms/Views/Label.swift
+++ b/MVMCoreUI/Atoms/Views/Label.swift
@@ -598,7 +598,7 @@ extension Label {
         return true
     }
     
-    public func alignment() -> UIStackView.Alignment {
+    public func horizontalAlignment() -> UIStackView.Alignment {
         return .leading
     }
     
diff --git a/MVMCoreUI/Atoms/Views/MVMCoreUISwitch.m b/MVMCoreUI/Atoms/Views/MVMCoreUISwitch.m
index 8ec71241..33874a8d 100644
--- a/MVMCoreUI/Atoms/Views/MVMCoreUISwitch.m
+++ b/MVMCoreUI/Atoms/Views/MVMCoreUISwitch.m
@@ -193,7 +193,7 @@ const CGFloat SwitchShakeIntensity = 2;
     return YES;
 }
 
-- (UIStackViewAlignment)alignment {
+- (UIStackViewAlignment)horizontalAlignment {
     return UIStackViewAlignmentTrailing;
 }
 
diff --git a/MVMCoreUI/Containers/Container.swift b/MVMCoreUI/Containers/Container.swift
index f5bddcb9..5b565683 100644
--- a/MVMCoreUI/Containers/Container.swift
+++ b/MVMCoreUI/Containers/Container.swift
@@ -217,7 +217,7 @@ public extension Container {
         }
         
         if let verticalAlignmentString = json?.optionalStringForKey("verticalAlignment"), let alignment = ContainerHelper.getAlignment(for: verticalAlignmentString) ?? (view as? MVMCoreUIViewConstrainingProtocol)?.verticalAlignment?() {
-            containerHelper.alignHorizontal(alignment)
+            containerHelper.alignVertical(alignment)
         } else if let alignment = (view as? MVMCoreUIViewConstrainingProtocol)?.verticalAlignment?() {
             containerHelper.alignVertical(alignment)
         }
diff --git a/MVMCoreUI/Legacy/Views/MVMCoreUICheckBox.m b/MVMCoreUI/Legacy/Views/MVMCoreUICheckBox.m
index 54358ebe..40fa987f 100644
--- a/MVMCoreUI/Legacy/Views/MVMCoreUICheckBox.m
+++ b/MVMCoreUI/Legacy/Views/MVMCoreUICheckBox.m
@@ -54,7 +54,7 @@ static const CGFloat CheckBoxHeightWidth = 18.0;
     return YES;
 }
 
-- (UIStackViewAlignment)alignment {
+- (UIStackViewAlignment)horizontalAlignment {
     return UIStackViewAlignmentLeading;
 }
 
diff --git a/MVMCoreUI/Organisms/MoleculeStackView.swift b/MVMCoreUI/Organisms/MoleculeStackView.swift
index 892243c8..4b37b66d 100644
--- a/MVMCoreUI/Organisms/MoleculeStackView.swift
+++ b/MVMCoreUI/Organisms/MoleculeStackView.swift
@@ -135,26 +135,24 @@ open class MoleculeStackView: Container {
         
         // Adds the molecules and sets the json.
         for (index, map) in molecules.enumerated() {
-            if let moleculeJSON = map.optionalDictionaryForKey(KeyMolecule) {
-                var view: UIView?
-                var stackItemModel: StackItemModel
-                if let item = items?[index] {
-                    stackItemModel = item
-                    item.update(with: map)
-                    view = item.view
-                    (view as? MVMCoreUIMoleculeViewProtocol)?.setWithJSON(moleculeJSON, delegateObject: delegateObject, additionalData: nil)
-                    addStackItem(item, lastItem: index == molecules.count - 1)
-                } else {
-                    let stackItem = StackItem()
-                    stackItem.setWithJSON(map, delegateObject: delegateObject, additionalData: additionalData)
-                    view = stackItem
-                    stackItemModel = StackItemModel(with: stackItem, json: map)
-                    addStackItem(stackItemModel, lastItem: index == molecules.count - 1)
-                }
-                
-                stackItemModel.useHorizontalMargins = moleculesShouldSetHorizontalMargins
-                stackItemModel.useVerticalMargins = moleculesShouldSetVerticalMargins
+            var view: UIView?
+            var stackItemModel: StackItemModel
+            if let item = items?[index] {
+                stackItemModel = item
+                item.update(with: map)
+                view = item.view
+                (view as? MVMCoreUIMoleculeViewProtocol)?.setWithJSON(map, delegateObject: delegateObject, additionalData: nil)
+                addStackItem(item, lastItem: index == molecules.count - 1)
+            } else {
+                let stackItem = StackItem()
+                stackItem.setWithJSON(map, delegateObject: delegateObject, additionalData: additionalData)
+                view = stackItem
+                stackItemModel = StackItemModel(with: stackItem, json: map)
+                addStackItem(stackItemModel, lastItem: index == molecules.count - 1)
             }
+            
+            stackItemModel.useHorizontalMargins = moleculesShouldSetHorizontalMargins
+            stackItemModel.useVerticalMargins = moleculesShouldSetVerticalMargins
         }
     }