diff --git a/src/Components/MudStaticButton.razor b/src/Components/MudStaticButton.razor
index 12aa49e..5d2b4fc 100644
--- a/src/Components/MudStaticButton.razor
+++ b/src/Components/MudStaticButton.razor
@@ -75,6 +75,7 @@ else
         {
             return@<input type="hidden" name="ReturnUrl" value="@ReturnUrl" />;
         }
+
         return null;
     }
 }
\ No newline at end of file
diff --git a/src/Components/MudStaticCheckBox.razor b/src/Components/MudStaticCheckBox.razor
index e5fc672..7ad453a 100644
--- a/src/Components/MudStaticCheckBox.razor
+++ b/src/Components/MudStaticCheckBox.razor
@@ -7,8 +7,8 @@
         <label class="@LabelClassname" id="@($"checkbox-container-{_elementId}")" @onclick:stopPropagation="@StopClickPropagation">
             <span tabindex="0" class="@CheckBoxClassname">
                 <input type="hidden" id="@($"empty-checkbox-{_elementId}")" name="@(_checkboxValue ? "" : _name)" value="False" />
-                <input tabindex="-1" @attributes="@UserAttributes" type="checkbox" class="mud-checkbox-input" name="@(_checkboxValue ? _name : "")" value="True"
-                       aria-checked="@_checkboxValue.ToString().ToLower()" aria-readonly="@(GetDisabledState().ToString().ToLower())"
+                <input tabindex="-1" @attributes="@UserAttributes" type="checkbox" class="mud-checkbox-input" name="@(_checkboxValue ? _name : "")" 
+                       value="True" aria-checked="@_checkboxValue.ToString().ToLower()" aria-readonly="@(GetDisabledState().ToString().ToLower())"
                        id="@($"static-checkbox-{_elementId}")" disabled="@GetDisabledState()" @onclick:preventDefault="@GetReadOnlyState()"/>
                 <MudIcon Icon="@CheckedIcon" Color="HasErrors ? Color.Error : this.Color" Size="@Size" 
                          id="@($"check-icon-{_elementId}")" style="@($"display: {_checkedStyle}")"/>
@@ -98,4 +98,4 @@
             }
         });
     })();
-</script>
+</script>
\ No newline at end of file
diff --git a/src/Components/MudStaticSwitch.razor b/src/Components/MudStaticSwitch.razor
index 9c1f9bb..2ab6e8c 100644
--- a/src/Components/MudStaticSwitch.razor
+++ b/src/Components/MudStaticSwitch.razor
@@ -10,8 +10,8 @@
                 <span tabindex="0" class="@SwitchClassname" id="@($"switch-container-{_elementId}")">
                     <span class="mud-switch-button">
                         <input type="hidden" id="@($"empty-switch-{_elementId}")" name="@(_switchValue ? "" : _name)" value="False" />
-                        <input tabindex="-1" @attributes="@UserAttributes" type="checkbox" class="mud-switch-input" name="@(_switchValue ? _name : "")" value="True"
-                               aria-checked="@_switchValue.ToString().ToLower()" aria-readonly="@(GetDisabledState().ToString().ToLower())"
+                        <input tabindex="-1" @attributes="@UserAttributes" type="checkbox" class="mud-switch-input" name="@(_switchValue ? _name : "")" 
+                               value="True" aria-checked="@_switchValue.ToString().ToLower()" aria-readonly="@(GetDisabledState().ToString().ToLower())"
                                id="@($"static-switch-{_elementId}")" disabled="@GetDisabledState()" @onclick:preventDefault="@GetReadOnlyState()"/>
                         <span class="@ThumbClassname">
                             @if (!string.IsNullOrEmpty(ThumbIcon))