diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj
index 6686c926..374adbc5 100644
--- a/MVMCoreUI.xcodeproj/project.pbxproj
+++ b/MVMCoreUI.xcodeproj/project.pbxproj
@@ -19,7 +19,7 @@
 		01DF567021FA5AB300CC099B /* TextFieldListFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DF566F21FA5AB300CC099B /* TextFieldListFormViewController.swift */; };
 		01E569D3223FFFA500327251 /* ThreeLayerViewController.swift in Headers */ = {isa = PBXBuildFile; fileRef = D2A5146A2214905000345BFB /* ThreeLayerViewController.swift */; settings = {ATTRIBUTES = (Public, ); }; };
 		B8200E152280C4CF007245F4 /* ProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8200E142280C4CF007245F4 /* ProgressBar.swift */; };
-		B8200E192281DC1A007245F4 /* ProgressBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8200E182281DC1A007245F4 /* ProgressBarView.swift */; };
+		B8200E192281DC1A007245F4 /* ProgressBarWithLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8200E182281DC1A007245F4 /* ProgressBarWithLabel.swift */; };
 		D206997721FB8A0B00CAE0DE /* MVMCoreUINavigationController.h in Headers */ = {isa = PBXBuildFile; fileRef = D206997521FB8A0B00CAE0DE /* MVMCoreUINavigationController.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D206997821FB8A0B00CAE0DE /* MVMCoreUINavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = D206997621FB8A0B00CAE0DE /* MVMCoreUINavigationController.m */; };
 		D20A9A5E2243D3E300ADE781 /* TwoButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20A9A5D2243D3E300ADE781 /* TwoButtonView.swift */; };
@@ -186,7 +186,7 @@
 		01DF55DF21F8FAA800CC099B /* MFTextFieldListView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MFTextFieldListView.swift; sourceTree = "<group>"; };
 		01DF566F21FA5AB300CC099B /* TextFieldListFormViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldListFormViewController.swift; sourceTree = "<group>"; };
 		B8200E142280C4CF007245F4 /* ProgressBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressBar.swift; sourceTree = "<group>"; };
-		B8200E182281DC1A007245F4 /* ProgressBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressBarView.swift; sourceTree = "<group>"; };
+		B8200E182281DC1A007245F4 /* ProgressBarWithLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressBarWithLabel.swift; sourceTree = "<group>"; };
 		D206997521FB8A0B00CAE0DE /* MVMCoreUINavigationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUINavigationController.h; sourceTree = "<group>"; };
 		D206997621FB8A0B00CAE0DE /* MVMCoreUINavigationController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUINavigationController.m; sourceTree = "<group>"; };
 		D20A9A5D2243D3E300ADE781 /* TwoButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TwoButtonView.swift; sourceTree = "<group>"; };
@@ -468,7 +468,7 @@
 				D274CA322236A78900B01B62 /* StandardFooterView.swift */,
 				D2E1FADC2268B25E00AEFD8C /* MoleculeTableViewCell.swift */,
 				B8200E142280C4CF007245F4 /* ProgressBar.swift */,
-				B8200E182281DC1A007245F4 /* ProgressBarView.swift */,
+				B8200E182281DC1A007245F4 /* ProgressBarWithLabel.swift */,
 			);
 			path = Molecules;
 			sourceTree = "<group>";
@@ -975,7 +975,7 @@
 				D2A514632213643100345BFB /* MoleculeStackCenteredTemplate.swift in Sources */,
 				D29DF32421ED0DA2003B2FB9 /* TextButtonView.m in Sources */,
 				D29DF29E21E7AE3B003B2FB9 /* MFStyler.m in Sources */,
-				B8200E192281DC1A007245F4 /* ProgressBarView.swift in Sources */,
+				B8200E192281DC1A007245F4 /* ProgressBarWithLabel.swift in Sources */,
 				D2A514592211C53C00345BFB /* MVMCoreUIMoleculeMappingObject.m in Sources */,
 				0105618D224BBE7700E1557D /* FormValidator.swift in Sources */,
 				D22D1F1B220341F60077CEC0 /* MVMCoreUICheckBox.m in Sources */,
diff --git a/MVMCoreUI/Molecules/ProgressBarView.swift b/MVMCoreUI/Molecules/ProgressBarWithLabel.swift
similarity index 95%
rename from MVMCoreUI/Molecules/ProgressBarView.swift
rename to MVMCoreUI/Molecules/ProgressBarWithLabel.swift
index 8106e0f7..9740e1ba 100644
--- a/MVMCoreUI/Molecules/ProgressBarView.swift
+++ b/MVMCoreUI/Molecules/ProgressBarWithLabel.swift
@@ -8,7 +8,7 @@
 
 import UIKit
 
-@objcMembers public class ProgressBarView: ViewConstrainingView {
+@objcMembers public class ProgressBarWithLabel: ViewConstrainingView {
     
     var progress = ProgressBar()
     var topleftlabel = Label()
@@ -22,7 +22,8 @@ import UIKit
     
     open override func setWithJSON(_ json: [AnyHashable: Any]?, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
         super.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
-        progress.setWithJSON(json, delegateObject: delegateObject, additionalData: additionalData)
+        let progressbarjson = json?.optionalDictionaryForKey("progressbar")
+        progress.setWithJSON(progressbarjson, delegateObject: delegateObject, additionalData: additionalData)
 
         let topleftlabeljson = json?.optionalDictionaryForKey("label")
         let toprightlabeljson = json?.optionalDictionaryForKey("toprightlabel")
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
index 309491bf..0518299f 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
@@ -36,7 +36,7 @@
                      @"caretButton": CaretButton.class,
                      @"textField" : MFTextField.class,
                      @"checkbox" : MVMCoreUICheckBox.class,
-                     @"progressBarView" : ProgressBarView.class,
+                     @"progressBarWithLabel" : ProgressBarWithLabel.class,
                      @"progressBar": ProgressBar.class,
                      @"textField": MFTextField.class,
                      @"checkbox": MVMCoreUICheckBox.class,