diff --git a/VDS.xcodeproj/project.pbxproj b/VDS.xcodeproj/project.pbxproj
index 3188ba91..9a648e61 100644
--- a/VDS.xcodeproj/project.pbxproj
+++ b/VDS.xcodeproj/project.pbxproj
@@ -1131,7 +1131,7 @@
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 28;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1168,7 +1168,7 @@
 				BUILD_LIBRARY_FOR_DISTRIBUTION = YES;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 27;
+				CURRENT_PROJECT_VERSION = 28;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
diff --git a/VDS/Classes/Control.swift b/VDS/Classes/Control.swift
index 2823bb80..35862574 100644
--- a/VDS/Classes/Control.swift
+++ b/VDS/Classes/Control.swift
@@ -84,18 +84,16 @@ open class Control: UIControl, Handlerable, ViewProtocol, Resettable, UserInfoab
         }
     }
     
-//    /// Override to deal with setNeedsUpdate()
-//    open override var isEnabled: Bool {
-//        get { !disabled }
-//        set {
-//            if disabled != !newValue {
-//                disabled = !newValue
-//            }
-//            isUserInteractionEnabled = isEnabled
-//            setNeedsUpdate()
-//        }
-//    }
-//
+    /// Override to deal with setNeedsUpdate()
+    open override var isEnabled: Bool {
+        get { !disabled }
+        set {
+            if disabled != !newValue {
+                disabled = !newValue
+            }
+        }
+    }
+
     //--------------------------------------------------
     // MARK: - Initializers
     //--------------------------------------------------
diff --git a/VDS/Components/Buttons/Button/ButtonBase.swift b/VDS/Components/Buttons/Button/ButtonBase.swift
index 00eed2db..d21af3b8 100644
--- a/VDS/Components/Buttons/Button/ButtonBase.swift
+++ b/VDS/Components/Buttons/Button/ButtonBase.swift
@@ -80,6 +80,16 @@ open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettab
         }
     }
   
+    /// Override to deal with setNeedsUpdate()
+    open override var isEnabled: Bool {
+        get { !disabled }
+        set {
+            if disabled != !newValue {
+                disabled = !newValue
+            }
+        }
+    }
+    
     open override var state: UIControl.State {
         get {
             var state = super.state
diff --git a/VDS/SupportingFiles/ReleaseNotes.txt b/VDS/SupportingFiles/ReleaseNotes.txt
index 4f5bea0b..057162db 100644
--- a/VDS/SupportingFiles/ReleaseNotes.txt
+++ b/VDS/SupportingFiles/ReleaseNotes.txt
@@ -1,3 +1,7 @@
+1.0.28
+=======
+- CXTDT-423141- Tabs - Incorrect spacing on top-aligned Fill container
+
 1.0.27
 =======
 - Added Loader View