diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryFieldModel.swift
index 979fac4d..d89f5e16 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/ItemDropdownEntryFieldModel.swift
@@ -45,6 +45,7 @@
         if let selectedIndex = try typeContainer.decodeIfPresent(Int.self, forKey: .selectedIndex) {
             self.selectedIndex = selectedIndex
         }
+        baseValue = options.indices.contains(selectedIndex) ? options[selectedIndex] : nil
     }
     
     public override func encode(to encoder: Encoder) throws {
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
index 2daee169..2c4aa736 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
@@ -323,6 +323,9 @@ import UIKit
         case .email:
             textField.keyboardType = .emailAddress
             
+        case .phone:
+            textField.keyboardType = .phonePad
+            
         default:
             break
         }
diff --git a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryFieldModel.swift b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryFieldModel.swift
index db5f3724..6f54cb38 100644
--- a/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryFieldModel.swift
+++ b/MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryFieldModel.swift
@@ -18,6 +18,7 @@
         case number
         case email
         case text
+        case phone
     }
     
     //--------------------------------------------------
diff --git a/MVMCoreUI/Atomic/Atoms/Views/Wheel.swift b/MVMCoreUI/Atomic/Atoms/Views/Wheel.swift
index 430aad94..dc50f8f3 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/Wheel.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/Wheel.swift
@@ -11,7 +11,7 @@ import UIKit
 @objcMembers open class Wheel: View, MVMCoreUIViewConstrainingProtocol {
     
     var heightConstraint: NSLayoutConstraint?
-    var gradientLayer: CALayer?
+    weak var gradientLayer: CALayer?
     var graphModel: WheelModel? {
         return model as? WheelModel
     }
@@ -193,20 +193,9 @@ import UIKit
             rotation.timingFunction = CAMediaTimingFunction(name: .linear)
             rotation.fillMode = .both
             rotation.isRemovedOnCompletion = false
+            rotation.repeatCount = Float.greatestFiniteMagnitude
             
-            //avoid infinity animation take high CPU momery usage when layer is not displayed
-            rotation.delegate = self
-            rotation.repeatCount = 1
             self.gradientLayer?.add(rotation, forKey: "rotation")
         })
     }
 }
-
-
-extension Wheel: CAAnimationDelegate {
-    public func animationDidStop(_ anim: CAAnimation, finished flag: Bool) {
-        if let object = graphModel {
-            rotationAnimation(object)
-        }
-    }
-}