diff --git a/MVMCoreUI/Atoms/Buttons/Link.swift b/MVMCoreUI/Atoms/Buttons/Link.swift
index 4a498fdd..8cb9bb49 100644
--- a/MVMCoreUI/Atoms/Buttons/Link.swift
+++ b/MVMCoreUI/Atoms/Buttons/Link.swift
@@ -82,7 +82,7 @@ extension Link {
 // MARK: - MVMCoreUIViewConstrainingProtocol
 extension Link: MVMCoreUIViewConstrainingProtocol {
     
-    public func alignment() -> UIStackView.Alignment {
+    public func horizontalAlignment() -> UIStackView.Alignment {
         return .leading
     }
 }
diff --git a/MVMCoreUI/Atoms/Views/LineModel.swift b/MVMCoreUI/Atoms/Views/LineModel.swift
index f481d4d5..53bc1f4c 100644
--- a/MVMCoreUI/Atoms/Views/LineModel.swift
+++ b/MVMCoreUI/Atoms/Views/LineModel.swift
@@ -43,7 +43,9 @@ import UIKit
     public static var identifier: String = "line"
     public var type: Style = .standard
     public var frequency: Frequency? = .allExceptTop
-    public var color: Color?
+
+    //TODO: use color insted of backgroundColor. Needs server changes
+//    public var color: Color?
     public var backgroundColor: Color?
     
     public init(type: Style) {
@@ -66,7 +68,7 @@ import UIKit
         if let frequency = try typeContainer.decodeIfPresent(Frequency.self, forKey: .frequency) {
             self.frequency = frequency
         }
-        color = try typeContainer.decodeIfPresent(Color.self, forKey: .color)
+        backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor)
     }
        
     public func encode(to encoder: Encoder) throws {
@@ -74,6 +76,6 @@ import UIKit
         try container.encode(moleculeName, forKey: .moleculeName)
         try container.encode(type, forKey: .type)
         try container.encodeIfPresent(frequency, forKey: .frequency)
-        try container.encodeIfPresent(color, forKey: .color)
+        try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor)
     }
 }
diff --git a/MVMCoreUI/Atoms/Views/ProgressBarModel.swift b/MVMCoreUI/Atoms/Views/ProgressBarModel.swift
index 2efa0403..dd53afac 100644
--- a/MVMCoreUI/Atoms/Views/ProgressBarModel.swift
+++ b/MVMCoreUI/Atoms/Views/ProgressBarModel.swift
@@ -9,7 +9,7 @@
 import Foundation
 
 @objcMembers public class ProgressBarModel: MoleculeModelProtocol {
-    public static var identifier: String = "progressbar"
+    public static var identifier: String = "progressBar"
     @Percent public var percent: CGFloat
     public var progressColor: Color = Color(uiColor: .mfCerulean())
     public var backgroundColor: Color? = Color(uiColor: .mfLightSilver())