diff --git a/MVMCoreUI/Atoms/Buttons/Link/Link.swift b/MVMCoreUI/Atoms/Buttons/Link/Link.swift
index 1259d0d8..c64bd13b 100644
--- a/MVMCoreUI/Atoms/Buttons/Link/Link.swift
+++ b/MVMCoreUI/Atoms/Buttons/Link/Link.swift
@@ -36,6 +36,13 @@ import UIKit
         context?.strokePath()
     }
     
+    open override var intrinsicContentSize: CGSize {
+        guard let size = titleLabel?.intrinsicContentSize else {
+            return super.intrinsicContentSize
+        }
+        return CGSize(width: size.width, height: size.height + 2)
+    }
+    
     //--------------------------------------------------
     // MARK: - ModelMoleculeViewProtocol
     //--------------------------------------------------
@@ -81,6 +88,7 @@ extension Link {
         titleLabel?.lineBreakMode = .byTruncatingTail
         titleLabel?.textAlignment = .left
         contentHorizontalAlignment = .left
+        contentVerticalAlignment = .top
     }
 }
 
diff --git a/MVMCoreUI/Atoms/Views/RadioButtonModel.swift b/MVMCoreUI/Atoms/Views/RadioButtonModel.swift
index c8443691..d26e1671 100644
--- a/MVMCoreUI/Atoms/Views/RadioButtonModel.swift
+++ b/MVMCoreUI/Atoms/Views/RadioButtonModel.swift
@@ -13,5 +13,39 @@ public class RadioButtonModel: MoleculeModelProtocol {
     public static var identifier: String = "radioButton"
     public var backgroundColor: Color?
     public var state: Bool = false
+    public var enabled: Bool = true
     public var fieldKey: String?
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case backgroundColor
+        case state
+        case enabled
+        case fieldKey
+    }
+    
+    public init(_ state: Bool) {
+        self.state = state
+    }
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        if let state = try typeContainer.decodeIfPresent(Bool.self, forKey: .state) {
+            self.state = state
+        }
+        if let enabled = try typeContainer.decodeIfPresent(Bool.self, forKey: .enabled) {
+            self.enabled = enabled
+        }
+        backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
+        fieldKey = try typeContainer.decodeIfPresent(String.self, forKey: .fieldKey)
+    }
+    
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
+        try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encode(state, forKey: .state)
+        try container.encode(enabled, forKey: .enabled)
+        try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
+    }
 }
diff --git a/MVMCoreUI/Atoms/Views/ToggleModel.swift b/MVMCoreUI/Atoms/Views/ToggleModel.swift
index 04b45fe2..948a8e96 100644
--- a/MVMCoreUI/Atoms/Views/ToggleModel.swift
+++ b/MVMCoreUI/Atoms/Views/ToggleModel.swift
@@ -49,7 +49,7 @@ public class ToggleModel: MoleculeModelProtocol {
         try container.encodeModelIfPresent(action, forKey: .action)
         try container.encodeModelIfPresent(alternateAction, forKey: .alternateAction)
         try container.encode(moleculeName, forKey: .moleculeName)
-        try container.encodeIfPresent(state, forKey: .state)
+        try container.encode(state, forKey: .state)
         try container.encodeIfPresent(required, forKey: .required)
         try container.encodeIfPresent(fieldKey, forKey: .fieldKey)
     }
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m
index 6a0805f3..d3db2a2d 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIViewControllerMappingObject.m
@@ -23,8 +23,8 @@
                                    @"centerMoleculeStack" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeStackCenteredTemplate class]],
                                    @"list" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[MoleculeListTemplate class]],
                                    @"threeLayer" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[ThreeLayerTemplate class]],
-                                   @"stackModal" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[ModalMoleculeStackTemplate class]],
-                                   @"listModal" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[ModalMoleculeListTemplate class]]
+                                   @"modalStack" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[ModalMoleculeStackTemplate class]],
+                                   @"modalList" : [[MVMCoreViewControllerProgrammaticMappingObject alloc] initWithClass:[ModalMoleculeListTemplate class]]
                                    } mutableCopy];
     });
     return viewControllerMapping;