diff --git a/MVMCoreUI/Atoms/Views/SeparatorView.m b/MVMCoreUI/Atoms/Views/SeparatorView.m
index 50e59758..43c33f44 100644
--- a/MVMCoreUI/Atoms/Views/SeparatorView.m
+++ b/MVMCoreUI/Atoms/Views/SeparatorView.m
@@ -107,7 +107,7 @@
                 [self setAsMedium];
             } else if ([type isEqualToString:@"heavy"]) {
                 [self setAsHeavy];
-            } else {
+            } else if ([type isEqualToString:@"standard"]) {
                 [self setAsLight];
             }
         }
diff --git a/MVMCoreUI/Molecules/StandardHeaderView.swift b/MVMCoreUI/Molecules/StandardHeaderView.swift
index 308341fa..6a14416e 100644
--- a/MVMCoreUI/Molecules/StandardHeaderView.swift
+++ b/MVMCoreUI/Molecules/StandardHeaderView.swift
@@ -41,7 +41,7 @@ public class StandardHeaderView: ViewConstrainingView {
             messageLabel.setContentHuggingPriority(UILayoutPriority.required, for: NSLayoutConstraint.Axis.vertical)
             setContentHuggingPriority(UILayoutPriority.required, for: NSLayoutConstraint.Axis.vertical)
             
-            topPin = headlineLabel.topAnchor.constraint(equalTo: topAnchor, constant: PaddingFive)
+            topPin = headlineLabel.topAnchor.constraint(equalTo: topAnchor, constant: PaddingDefaultVerticalSpacing)
             topPin?.isActive = true
 
             spaceBetweenLabels = messageLabel.topAnchor.constraint(equalTo: headlineLabel.bottomAnchor, constant: PaddingTwo)
@@ -126,8 +126,9 @@ public class StandardHeaderView: ViewConstrainingView {
         headlineLabel.setWithJSON(headlineJSON, delegateObject: delegateObject, additionalData: additionalData)
         let bodyJSON = json?.optionalDictionaryForKey("body")
         messageLabel.setWithJSON(bodyJSON, delegateObject: delegateObject, additionalData: additionalData)
-        let separatorJSON = json?.optionalDictionaryForKey("separator")
-        separatorView?.setWithJSON(separatorJSON, delegateObject: delegateObject, additionalData: additionalData)
+        if let separatorJSON = json?.optionalDictionaryForKey("separator") {
+            separatorView?.setWithJSON(separatorJSON, delegateObject: delegateObject, additionalData: additionalData)
+        }
         
         if separatorView?.isHidden ?? true {
             bottomPin?.constant = 0
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
index 0d80000b..9329a0a3 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
@@ -27,10 +27,10 @@
                      @"separator": SeparatorView.class,
                      @"button": ButtonView.class,
                      @"textButton": MFTextButton.class,
-                     @"standardHeader": StandardHeaderView.class,
+                     @"header": StandardHeaderView.class,
                      @"moleculeStack": MoleculeStackView.class,
                      @"twoButtonView": TwoButtonView.class,
-                     @"standardFooter": StandardFooterView.class,
+                     @"footer": StandardFooterView.class,
                      @"caretView": CaretView.class,
                      @"caretButton": CaretButton.class,
                      @"textField": MFTextField.class,