diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheel.swift
index a4f18df6..485a5464 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheel.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheel.swift
@@ -12,11 +12,6 @@ import Foundation
     let wheel = GraphView(frame: .zero)
     let leftLabel = Label(frame: .zero)
     let rightLabel = Label(frame: .zero)
-    let leftLabelWidthConstant : CGFloat = 151.0
-    let rightLabelWidthConstant : CGFloat = 84.0
-    let wheelTrailingConstant : CGFloat = -72.0
-    let rightLabelLeadingAnchorConstant : CGFloat = 8.0
-    
     //-------------------------------------------------
     // MARK: - View Cycle
     //-------------------------------------------------
@@ -41,33 +36,31 @@ import Foundation
         NSLayoutConstraint.constraintPinSubview(toSuperview: contentView)
         contentView.translatesAutoresizingMaskIntoConstraints = false
         
-    //-------------------------------------------------
-    // MARK: - Constraining
-    //-------------------------------------------------
+        //-------------------------------------------------
+        // MARK: - Constraining
+        //-------------------------------------------------
         self.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
             leftLabel.leadingAnchor.constraint(equalTo: contentView.leadingAnchor),
             leftLabel.topAnchor.constraint(equalTo: contentView.topAnchor),
             leftLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
-            leftLabel.widthAnchor.constraint(lessThanOrEqualToConstant: leftLabelWidthConstant)
-        ])
-
-        let rightLabelTrailing = rightLabel.trailingAnchor.constraint(equalTo: contentView.trailingAnchor)
-        rightLabelTrailing.priority = .defaultHigh
-        NSLayoutConstraint.activate([
-            rightLabelTrailing,
-            rightLabel.leadingAnchor.constraint(greaterThanOrEqualTo : wheel.trailingAnchor, constant: rightLabelLeadingAnchorConstant),
-            rightLabel.topAnchor.constraint(equalTo: contentView.topAnchor),
-            rightLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
-            rightLabel.widthAnchor.constraint(lessThanOrEqualToConstant: rightLabelWidthConstant)
+            leftLabel.widthAnchor.constraint(equalTo: contentView.widthAnchor, multiplier: 0.3)
         ])
         NSLayoutConstraint.activate([
-            wheel.trailingAnchor.constraint(equalTo: contentView.trailingAnchor, constant:wheelTrailingConstant),
             wheel.topAnchor.constraint(equalTo: contentView.topAnchor),
             wheel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
         ])
+        
+        let rightLabelTrailing = rightLabel.trailingAnchor.constraint(equalTo: contentView.trailingAnchor)
+        rightLabelTrailing.priority = UILayoutPriority(900)
+        NSLayoutConstraint.activate([
+            rightLabelTrailing,
+            rightLabel.leadingAnchor.constraint(equalTo: wheel.trailingAnchor),
+            rightLabel.widthAnchor.constraint(equalTo: contentView.widthAnchor, multiplier: 0.30),
+            rightLabel.topAnchor.constraint(equalTo: contentView.topAnchor),
+            rightLabel.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
+        ])
     }
-    
     //-------------------------------------------------
     // MARK: - MVMCoreUIMoleculeViewProtocol
     //-------------------------------------------------
@@ -88,7 +81,6 @@ import Foundation
         rightLabel.reset()
         wheel.reset()
     }
-    
     public override class func estimatedHeight(forRow molecule: MoleculeModelProtocol?, delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return 43
     }
diff --git a/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheelModel.swift b/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheelModel.swift
index 5d8a041a..9b8a95f4 100644
--- a/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheelModel.swift
+++ b/MVMCoreUI/Molecules/VerticalCombinationViews/ListRVWheelModel.swift
@@ -7,7 +7,8 @@
 //
 
 import Foundation
-public class ListRVWheelModel:ListItemModelProtocol {
+public class ListRVWheelModel:ListItemModelProtocol,MoleculeModelProtocol {
+    
     public var backgroundColor: Color?
     public var line: LineModel?
     public var hideArrow: Bool?