diff --git a/src/BlazorStrap/Components/BSAlert.razor b/src/BlazorStrap/Components/BSAlert.razor
index d5a4fa4b..bb6d99bd 100644
--- a/src/BlazorStrap/Components/BSAlert.razor
+++ b/src/BlazorStrap/Components/BSAlert.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSAlertBase
 
 @if (IsOpen)
 {
diff --git a/src/BlazorStrap/Components/BSAlert.razor.cs b/src/BlazorStrap/Components/BSAlert.razor.cs
index b4c8400d..6e9db189 100644
--- a/src/BlazorStrap/Components/BSAlert.razor.cs
+++ b/src/BlazorStrap/Components/BSAlert.razor.cs
@@ -6,7 +6,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSAlertBase : ComponentBase
+    public partial class BSAlert : ComponentBase
     {
         [Parameter] public RenderFragment ChildContent { get; set; }
         [Parameter] public string Class { get; set; }
diff --git a/src/BlazorStrap/Components/BSAlertEvent.razor.cs b/src/BlazorStrap/Components/BSAlertEvent.razor.cs
index 31663e37..e0783339 100644
--- a/src/BlazorStrap/Components/BSAlertEvent.razor.cs
+++ b/src/BlazorStrap/Components/BSAlertEvent.razor.cs
@@ -2,6 +2,6 @@
 {
     public class BSAlertEvent
     {
-        public BSAlertBase Target { get; set; }
+        public BSAlert Target { get; set; }
     }
 }
diff --git a/src/BlazorStrap/Components/BSBadge.razor b/src/BlazorStrap/Components/BSBadge.razor
index 837e52e8..b3ba9c48 100644
--- a/src/BlazorStrap/Components/BSBadge.razor
+++ b/src/BlazorStrap/Components/BSBadge.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSBadgeBase
 
 <DynamicElement TagName="@Tag" class="@Classname" href="@Href" @onclick="MyOnClick" @attributes="@UnknownParameters">
     @ChildContent
diff --git a/src/BlazorStrap/Components/BSBadge.razor.cs b/src/BlazorStrap/Components/BSBadge.razor.cs
index ceaa5f3d..e00a3c68 100644
--- a/src/BlazorStrap/Components/BSBadge.razor.cs
+++ b/src/BlazorStrap/Components/BSBadge.razor.cs
@@ -6,7 +6,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSBadgeBase : ComponentBase
+    public partial class BSBadge : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/BSCustomizer.razor b/src/BlazorStrap/Components/BSCustomizer.razor
index 8debdc79..657c40f7 100644
--- a/src/BlazorStrap/Components/BSCustomizer.razor
+++ b/src/BlazorStrap/Components/BSCustomizer.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSCustomizerBase
     <style>
         :root {
             @foreach (var prop in Config.GetType().GetProperties())
diff --git a/src/BlazorStrap/Components/BSCustomizer.razor.cs b/src/BlazorStrap/Components/BSCustomizer.razor.cs
index 28725ef8..0c4a759f 100644
--- a/src/BlazorStrap/Components/BSCustomizer.razor.cs
+++ b/src/BlazorStrap/Components/BSCustomizer.razor.cs
@@ -2,7 +2,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSCustomizerBase : ComponentBase
+    public partial class BSCustomizer : ComponentBase
     {
         [Parameter] public BSCustomizerConfig Config { get; set; } = new BSCustomizerConfig();
     }
diff --git a/src/BlazorStrap/Components/BSProgress.razor b/src/BlazorStrap/Components/BSProgress.razor
index a9cbac47..3e0c7e8f 100644
--- a/src/BlazorStrap/Components/BSProgress.razor
+++ b/src/BlazorStrap/Components/BSProgress.razor
@@ -1,10 +1,9 @@
 @namespace BlazorStrap
-@inherits BSProgressBase
 
 @if (!IsMulti && !IsBar)
 {
     <DynamicElement style="@Style" @attributes="@UnknownParameters" TagName="div" class="progress">
-        <div class="@Classname" style="@styles" role="progressbar" aria-valuenow="@Value" aria-valuemin="0" aria-valuemax="@Max">@ChildContent</div>
+        <div class="@Classname" style="@Styles" role="progressbar" aria-valuenow="@Value" aria-valuemin="0" aria-valuemax="@Max">@ChildContent</div>
     </DynamicElement>
 }
 @if (IsMulti && !IsBar)
@@ -15,7 +14,7 @@
 }
 @if (!IsMulti && IsBar)
 {
-    <DynamicElement style="@styles" @attributes="@UnknownParameters" TagName="div" class="@Classname" role="progressbar" aria-valuenow="@Value" aria-valuemin="0" aria-valuemax="@Max">
+    <DynamicElement style="@Styles" @attributes="@UnknownParameters" TagName="div" class="@Classname" role="progressbar" aria-valuenow="@Value" aria-valuemin="0" aria-valuemax="@Max">
         @ChildContent
     </DynamicElement>
 }
\ No newline at end of file
diff --git a/src/BlazorStrap/Components/BSProgress.razor.cs b/src/BlazorStrap/Components/BSProgress.razor.cs
index 40269a17..d34c9ba4 100644
--- a/src/BlazorStrap/Components/BSProgress.razor.cs
+++ b/src/BlazorStrap/Components/BSProgress.razor.cs
@@ -6,7 +6,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSProgressBase : ComponentBase
+    public partial class BSProgress : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
@@ -24,7 +24,7 @@ public abstract class BSProgressBase : ComponentBase
 
         [Parameter] public int Value { get; set; }
         [Parameter] public int Max { get; set; } = 100;
-        protected string styles
+        protected string Styles
         {
             get
             {
diff --git a/src/BlazorStrap/Components/BSToast.Razor b/src/BlazorStrap/Components/BSToast.Razor
index 019f7ed7..622a2e66 100644
--- a/src/BlazorStrap/Components/BSToast.Razor
+++ b/src/BlazorStrap/Components/BSToast.Razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSToastBase
 
 @*
 Use With:
diff --git a/src/BlazorStrap/Components/BSToast.razor.cs b/src/BlazorStrap/Components/BSToast.razor.cs
index 831363be..d68f606f 100644
--- a/src/BlazorStrap/Components/BSToast.razor.cs
+++ b/src/BlazorStrap/Components/BSToast.razor.cs
@@ -6,7 +6,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSToastBase : ComponentBase
+    public partial class BSToast : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/BSTooltip.razor b/src/BlazorStrap/Components/BSTooltip.razor
index 467ded13..83b13557 100644
--- a/src/BlazorStrap/Components/BSTooltip.razor
+++ b/src/BlazorStrap/Components/BSTooltip.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSTooltipBase
 
 <div @ref="Tooltip" class="tooltip d-none" role="tooltip">
     <div @ref="Arrow" class="arrow"></div>
diff --git a/src/BlazorStrap/Components/BSTooltip.razor.cs b/src/BlazorStrap/Components/BSTooltip.razor.cs
index c37a68cf..c03c09a3 100644
--- a/src/BlazorStrap/Components/BSTooltip.razor.cs
+++ b/src/BlazorStrap/Components/BSTooltip.razor.cs
@@ -5,7 +5,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTooltipBase : ComponentBase
+    public partial class BSTooltip : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         [Inject] public BlazorStrapInterop BlazorStrapInterop { get; set; }
diff --git a/src/BlazorStrap/Components/Carousel/BSCarousel.razor b/src/BlazorStrap/Components/Carousel/BSCarousel.razor
index 807cd797..2f826d58 100644
--- a/src/BlazorStrap/Components/Carousel/BSCarousel.razor
+++ b/src/BlazorStrap/Components/Carousel/BSCarousel.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSCarouselBase
 
 <CascadingValue Value="this">
     <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname" @onmouseenter="OnMouseEnter" @onmouseleave="OnMouseLeave" @onkeypress="OnKeyPress">
diff --git a/src/BlazorStrap/Components/Carousel/BSCarousel.razor.cs b/src/BlazorStrap/Components/Carousel/BSCarousel.razor.cs
index 84826b9e..7aade50d 100644
--- a/src/BlazorStrap/Components/Carousel/BSCarousel.razor.cs
+++ b/src/BlazorStrap/Components/Carousel/BSCarousel.razor.cs
@@ -8,7 +8,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSCarouselBase : ComponentBase, IDisposable
+    public partial class BSCarousel : ComponentBase, IDisposable
     {
         private const string _carouselFade = "carousel-fade";
 
@@ -22,8 +22,8 @@ public int ActiveIndex
 
         private bool _timerEnabled { get; set; } = true;
         public bool AnimationRunning { get; set; } = false;
-        public List<BSCarouselIndicatorItemBase> CarouselIndicatorItems { get; } = new List<BSCarouselIndicatorItemBase>();
-        public List<BSCarouselItemBase> CarouselItems { get; } = new List<BSCarouselItemBase>();
+        public List<BSCarouselIndicatorItem> CarouselIndicatorItems { get; } = new List<BSCarouselIndicatorItem>();
+        public List<BSCarouselItem> CarouselItems { get; } = new List<BSCarouselItem>();
         [Parameter] public RenderFragment ChildContent { get; set; }
         [Parameter] public string Class { get; set; }
         [Parameter] public bool Fade { get; set; } = false;
@@ -173,7 +173,7 @@ private async Task DoAnimations()
             }
         }
 
-        public async Task AnimationEnd(BSCarouselItemBase sender)
+        public async Task AnimationEnd(BSCarouselItem sender)
         {
             if (sender == CarouselItems[ActiveIndex])
             {
diff --git a/src/BlazorStrap/Components/Carousel/BSCarouselCaption.razor b/src/BlazorStrap/Components/Carousel/BSCarouselCaption.razor
index 5de5a090..de2ab62a 100644
--- a/src/BlazorStrap/Components/Carousel/BSCarouselCaption.razor
+++ b/src/BlazorStrap/Components/Carousel/BSCarouselCaption.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSCarouselCaptionBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
     @if (HeaderText != null)
diff --git a/src/BlazorStrap/Components/Carousel/BSCarouselCaption.razor.cs b/src/BlazorStrap/Components/Carousel/BSCarouselCaption.razor.cs
index d51e0c6c..ab4e2af3 100644
--- a/src/BlazorStrap/Components/Carousel/BSCarouselCaption.razor.cs
+++ b/src/BlazorStrap/Components/Carousel/BSCarouselCaption.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSCarouselCaptionBase : ComponentBase
+    public partial class BSCarouselCaption : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Carousel/BSCarouselControl.razor b/src/BlazorStrap/Components/Carousel/BSCarouselControl.razor
index cd44040f..c2787e62 100644
--- a/src/BlazorStrap/Components/Carousel/BSCarouselControl.razor
+++ b/src/BlazorStrap/Components/Carousel/BSCarouselControl.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSCarouselControlBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="a" class="@Classname" role="button" @onclick="OnClick" href="javascript:void(0)">
     <span class="@IconClassname" aria-hidden="true"></span>
diff --git a/src/BlazorStrap/Components/Carousel/BSCarouselControl.razor.cs b/src/BlazorStrap/Components/Carousel/BSCarouselControl.razor.cs
index 8412c29d..83936cdf 100644
--- a/src/BlazorStrap/Components/Carousel/BSCarouselControl.razor.cs
+++ b/src/BlazorStrap/Components/Carousel/BSCarouselControl.razor.cs
@@ -5,7 +5,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSCarouselControlBase : ComponentBase
+    public partial class BSCarouselControl : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Carousel/BSCarouselIndicatorItem.razor b/src/BlazorStrap/Components/Carousel/BSCarouselIndicatorItem.razor
index 5d756915..8244ab14 100644
--- a/src/BlazorStrap/Components/Carousel/BSCarouselIndicatorItem.razor
+++ b/src/BlazorStrap/Components/Carousel/BSCarouselIndicatorItem.razor
@@ -1,4 +1,3 @@
 @namespace BlazorStrap
-@inherits BSCarouselIndicatorItemBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="li" class="@Classname" @onclick="OnClick" />
diff --git a/src/BlazorStrap/Components/Carousel/BSCarouselIndicatorItem.razor.cs b/src/BlazorStrap/Components/Carousel/BSCarouselIndicatorItem.razor.cs
index f6a6f06b..b512ba6a 100644
--- a/src/BlazorStrap/Components/Carousel/BSCarouselIndicatorItem.razor.cs
+++ b/src/BlazorStrap/Components/Carousel/BSCarouselIndicatorItem.razor.cs
@@ -5,7 +5,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSCarouselIndicatorItemBase : ComponentBase
+    public partial class BSCarouselIndicatorItem : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Carousel/BSCarouselIndicators.razor b/src/BlazorStrap/Components/Carousel/BSCarouselIndicators.razor
index dc84fe92..9af34555 100644
--- a/src/BlazorStrap/Components/Carousel/BSCarouselIndicators.razor
+++ b/src/BlazorStrap/Components/Carousel/BSCarouselIndicators.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSCarouselIndicatorsBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="ol" class="@Classname">
     @for (var i = 0; i < NumberOfItems; i++)
diff --git a/src/BlazorStrap/Components/Carousel/BSCarouselIndicators.razor.cs b/src/BlazorStrap/Components/Carousel/BSCarouselIndicators.razor.cs
index 265ed85d..31e1ec19 100644
--- a/src/BlazorStrap/Components/Carousel/BSCarouselIndicators.razor.cs
+++ b/src/BlazorStrap/Components/Carousel/BSCarouselIndicators.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSCarouselIndicatorsBase : ComponentBase
+    public partial class BSCarouselIndicators : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Carousel/BSCarouselItem.razor b/src/BlazorStrap/Components/Carousel/BSCarouselItem.razor
index 2082f4b1..192e1d90 100644
--- a/src/BlazorStrap/Components/Carousel/BSCarouselItem.razor
+++ b/src/BlazorStrap/Components/Carousel/BSCarouselItem.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSCarouselItemBase
 
     <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname" @ontransitionend="AnimationEnd">
         @if (AddActionLink)
diff --git a/src/BlazorStrap/Components/Carousel/BSCarouselItem.razor.cs b/src/BlazorStrap/Components/Carousel/BSCarouselItem.razor.cs
index d71424c0..5e29a948 100644
--- a/src/BlazorStrap/Components/Carousel/BSCarouselItem.razor.cs
+++ b/src/BlazorStrap/Components/Carousel/BSCarouselItem.razor.cs
@@ -10,7 +10,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSCarouselItemBase : ComponentBase
+    public partial class BSCarouselItem : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         [CascadingParameter] protected BSCarousel Parent { get; set; }
diff --git a/src/BlazorStrap/Components/Dropdown/BSDropdown.razor b/src/BlazorStrap/Components/Dropdown/BSDropdown.razor
index 21e0ff04..77146ded 100644
--- a/src/BlazorStrap/Components/Dropdown/BSDropdown.razor
+++ b/src/BlazorStrap/Components/Dropdown/BSDropdown.razor
@@ -1,5 +1,5 @@
 @namespace BlazorStrap
-@inherits BSDropdownBase
+@inherits ToggleableComponentBase
 
 <CascadingValue Value="@this">
     <CascadingValue Value="@DropDownMenu">
diff --git a/src/BlazorStrap/Components/Dropdown/BSDropdown.razor.cs b/src/BlazorStrap/Components/Dropdown/BSDropdown.razor.cs
index 6b4b66fa..d94c6f32 100644
--- a/src/BlazorStrap/Components/Dropdown/BSDropdown.razor.cs
+++ b/src/BlazorStrap/Components/Dropdown/BSDropdown.razor.cs
@@ -8,7 +8,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSDropdownBase : ToggleableComponentBase, IDisposable
+    public partial class BSDropdown : ToggleableComponentBase, IDisposable
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         [Parameter] public EventCallback<BSDropdownEvent> ShowEvent { get; set; }
@@ -22,13 +22,13 @@ public abstract class BSDropdownBase : ToggleableComponentBase, IDisposable
         internal List<EventCallback<BSDropdownEvent>> EventQue { get; set; } = new List<EventCallback<BSDropdownEvent>>();
 
         // Prevents rogue closing
-        private BSDropdownMenuBase _selected;
+        private BSDropdownMenu _selected;
 
-        private BSDropdownMenuBase _dropDownMenu { get; set; } = new BSDropdownMenu();
+        private BSDropdownMenu _dropDownMenu { get; set; } = new BSDropdownMenu();
         public bool Active { get; set; } = false;
         private bool _shouldClose { get; set; } = false;
 
-        internal BSDropdownMenuBase DropDownMenu
+        internal BSDropdownMenu DropDownMenu
         {
             get => _dropDownMenu;
             set
@@ -38,13 +38,24 @@ internal BSDropdownMenuBase DropDownMenu
             }
         }
 
-        public BSDropdownMenuBase Selected
+        public BSDropdownMenu Selected
         {
             get => _selected;
             set
             {
                 _selected = value;
                 if (_selected != null) _selected.Changed(true);
+                if(_selected == null)
+                {
+                    if(Dropdown != null)
+                    {
+                        Dropdown.Selected = _selected;
+                    }
+                    else if(NavItem != null)
+                    {
+                        NavItem.Selected = _selected;
+                    }
+                }
                 InvokeAsync(StateHasChanged);
             }
         }
diff --git a/src/BlazorStrap/Components/Dropdown/BSDropdownEvent.cs b/src/BlazorStrap/Components/Dropdown/BSDropdownEvent.cs
index 521b0bc6..a768fdec 100644
--- a/src/BlazorStrap/Components/Dropdown/BSDropdownEvent.cs
+++ b/src/BlazorStrap/Components/Dropdown/BSDropdownEvent.cs
@@ -2,6 +2,6 @@
 {
     public class BSDropdownEvent
     {
-        public BSDropdownBase Target { get; set; }
+        public BSDropdown Target { get; set; }
     }
 }
diff --git a/src/BlazorStrap/Components/Dropdown/BSDropdownHeader.razor b/src/BlazorStrap/Components/Dropdown/BSDropdownHeader.razor
index 7e92cd50..2f0449df 100644
--- a/src/BlazorStrap/Components/Dropdown/BSDropdownHeader.razor
+++ b/src/BlazorStrap/Components/Dropdown/BSDropdownHeader.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSDropdownHeaderBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="h6" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Dropdown/BSDropdownHeader.razor.cs b/src/BlazorStrap/Components/Dropdown/BSDropdownHeader.razor.cs
index 9a8a7f1b..2a31cdc9 100644
--- a/src/BlazorStrap/Components/Dropdown/BSDropdownHeader.razor.cs
+++ b/src/BlazorStrap/Components/Dropdown/BSDropdownHeader.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSDropdownHeaderBase : ComponentBase
+    public partial class BSDropdownHeader : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Dropdown/BSDropdownItem.razor b/src/BlazorStrap/Components/Dropdown/BSDropdownItem.razor
index 7912d434..11e03dfc 100644
--- a/src/BlazorStrap/Components/Dropdown/BSDropdownItem.razor
+++ b/src/BlazorStrap/Components/Dropdown/BSDropdownItem.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSDropdownItemBase
 
 <CascadingValue Value="@this">
     <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname" type="@Type" @onclick="OnClickEvent" href="@Href">
diff --git a/src/BlazorStrap/Components/Dropdown/BSDropdownItem.razor.cs b/src/BlazorStrap/Components/Dropdown/BSDropdownItem.razor.cs
index 5730788c..d23a6e61 100644
--- a/src/BlazorStrap/Components/Dropdown/BSDropdownItem.razor.cs
+++ b/src/BlazorStrap/Components/Dropdown/BSDropdownItem.razor.cs
@@ -8,7 +8,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSDropdownItemBase : ComponentBase, IDisposable
+    public partial class BSDropdownItem : ComponentBase, IDisposable
     {
         [Inject] protected NavigationManager UriHelper { get; set; }
 
@@ -45,10 +45,14 @@ protected void OnClickEvent(MouseEventArgs e)
             {
                 OnClick.InvokeAsync(e);
             }
-            if (!StayOpen && DropDown?.IsSubmenu == false && !HasSubMenu)
+            // Not Sure why I had this here commented out. Will remove after full testing.
+            // if (!StayOpen && DropDown?.IsSubmenu == false && !HasSubMenu)
+            //   {
+            if (!StayOpen)
             {
                 DropDown.Selected = null;
             }
+            //  }
         }
 
         protected override void OnInitialized()
diff --git a/src/BlazorStrap/Components/Dropdown/BSDropdownMenu.razor b/src/BlazorStrap/Components/Dropdown/BSDropdownMenu.razor
index 4688f95d..30fca983 100644
--- a/src/BlazorStrap/Components/Dropdown/BSDropdownMenu.razor
+++ b/src/BlazorStrap/Components/Dropdown/BSDropdownMenu.razor
@@ -1,6 +1,5 @@
 @namespace BlazorStrap
-@inherits BSDropdownMenuBase
-
+@inherits ToggleableComponentBase
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname" @onmouseleave="MouseOut" @bind-ElementRef="MyRef">
     @ChildContent
 </DynamicElement>
diff --git a/src/BlazorStrap/Components/Dropdown/BSDropdownMenu.razor.cs b/src/BlazorStrap/Components/Dropdown/BSDropdownMenu.razor.cs
index a26a949d..1bacd959 100644
--- a/src/BlazorStrap/Components/Dropdown/BSDropdownMenu.razor.cs
+++ b/src/BlazorStrap/Components/Dropdown/BSDropdownMenu.razor.cs
@@ -6,7 +6,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSDropdownMenuBase : ToggleableComponentBase
+    public partial class BSDropdownMenu : ToggleableComponentBase
     {
         [Inject] protected IJSRuntime JSRuntime { get; set; }
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
diff --git a/src/BlazorStrap/Components/Dropdown/BSDropdownToggle.razor b/src/BlazorStrap/Components/Dropdown/BSDropdownToggle.razor
index 0437abb2..de84ec73 100644
--- a/src/BlazorStrap/Components/Dropdown/BSDropdownToggle.razor
+++ b/src/BlazorStrap/Components/Dropdown/BSDropdownToggle.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSDropdownToggleBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname" href="@Href" type="@Type" aria-haspopup="true" @onclick="OnClickEvent" @onkeydown="Escape">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Dropdown/BSDropdownToggle.razor.cs b/src/BlazorStrap/Components/Dropdown/BSDropdownToggle.razor.cs
index 45c257c5..0aca73c1 100644
--- a/src/BlazorStrap/Components/Dropdown/BSDropdownToggle.razor.cs
+++ b/src/BlazorStrap/Components/Dropdown/BSDropdownToggle.razor.cs
@@ -7,7 +7,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSDropdownToggleBase : ComponentBase
+    public partial class BSDropdownToggle : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
@@ -43,7 +43,7 @@ public abstract class BSDropdownToggleBase : ComponentBase
         [Parameter] public EventCallback<MouseEventArgs> OnClick { get; set; }
         [Parameter] public string Class { get; set; }
         [Parameter] public RenderFragment ChildContent { get; set; }
-        [CascadingParameter] internal BSDropdownMenuBase Dropdown { get; set; }
+        [CascadingParameter] internal BSDropdownMenu Dropdown { get; set; }
 
         protected void Escape(KeyboardEventArgs e)
         {
diff --git a/src/BlazorStrap/Components/Figure/BSFigureCaption.razor b/src/BlazorStrap/Components/Figure/BSFigureCaption.razor
index 74019b5e..39bcaf53 100644
--- a/src/BlazorStrap/Components/Figure/BSFigureCaption.razor
+++ b/src/BlazorStrap/Components/Figure/BSFigureCaption.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSFigureCaptionBase
 
 <DynamicElement TagName="figcaption" class="@Classname" style="@Style" @attributes="@UnknownParameters">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Figure/BSFigureCaption.razor.cs b/src/BlazorStrap/Components/Figure/BSFigureCaption.razor.cs
index 1c92b5bc..0892c198 100644
--- a/src/BlazorStrap/Components/Figure/BSFigureCaption.razor.cs
+++ b/src/BlazorStrap/Components/Figure/BSFigureCaption.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSFigureCaptionBase : ComponentBase
+    public partial class BSFigureCaption : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Figure/BSFigureImage.razor b/src/BlazorStrap/Components/Figure/BSFigureImage.razor
index 224bbd2c..ef7d78eb 100644
--- a/src/BlazorStrap/Components/Figure/BSFigureImage.razor
+++ b/src/BlazorStrap/Components/Figure/BSFigureImage.razor
@@ -1,4 +1,3 @@
 @namespace BlazorStrap
-@inherits BSFigureImageBase
 
 <DynamicElement TagName="img" class="@Classname" style="@Style" @attributes="@UnknownParameters" />
diff --git a/src/BlazorStrap/Components/Figure/BSFigureImage.razor.cs b/src/BlazorStrap/Components/Figure/BSFigureImage.razor.cs
index e2298678..a5c179e8 100644
--- a/src/BlazorStrap/Components/Figure/BSFigureImage.razor.cs
+++ b/src/BlazorStrap/Components/Figure/BSFigureImage.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSFigureImageBase : ComponentBase
+    public partial class BSFigureImage : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Forms/BSButton.razor b/src/BlazorStrap/Components/Forms/BSButton.razor
index 87c3ba2f..a3ff99d4 100644
--- a/src/BlazorStrap/Components/Forms/BSButton.razor
+++ b/src/BlazorStrap/Components/Forms/BSButton.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSButtonBase
 
 <DynamicElement TagName="@Tag" @onclick="OnClick" type="@Type" class="@Classname" disabled="@Disabled" role="button" aria-pressed="@Pressed" aria-disabled="@Disabled" tabindex="@Tab" value="@Value" OnClickPreventDefault="OnClickPreventDefault" OnClickStopPropagation="OnClickStopPropagation" @attributes="@UnknownParameters">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Forms/BSButton.razor.cs b/src/BlazorStrap/Components/Forms/BSButton.razor.cs
index 834db081..33ec8a4a 100644
--- a/src/BlazorStrap/Components/Forms/BSButton.razor.cs
+++ b/src/BlazorStrap/Components/Forms/BSButton.razor.cs
@@ -6,7 +6,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSButtonBase : ComponentBase
+    public partial class BSButton : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Forms/BSButtonGroup.razor b/src/BlazorStrap/Components/Forms/BSButtonGroup.razor
index 28bb4089..7f3c1932 100644
--- a/src/BlazorStrap/Components/Forms/BSButtonGroup.razor
+++ b/src/BlazorStrap/Components/Forms/BSButtonGroup.razor
@@ -1,5 +1,5 @@
 @namespace BlazorStrap
-@inherits BSButtonGroupBase
-        <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
-            @ChildContent
-        </DynamicElement>
+
+<DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
+    @ChildContent
+</DynamicElement>
\ No newline at end of file
diff --git a/src/BlazorStrap/Components/Forms/BSButtonGroup.razor.cs b/src/BlazorStrap/Components/Forms/BSButtonGroup.razor.cs
index 2bb544db..ffc83e26 100644
--- a/src/BlazorStrap/Components/Forms/BSButtonGroup.razor.cs
+++ b/src/BlazorStrap/Components/Forms/BSButtonGroup.razor.cs
@@ -5,7 +5,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSButtonGroupBase : ComponentBase
+    public partial class BSButtonGroup : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Forms/BSFormGroup.razor b/src/BlazorStrap/Components/Forms/BSFormGroup.razor
index 721d1c7a..f45ddc1b 100644
--- a/src/BlazorStrap/Components/Forms/BSFormGroup.razor
+++ b/src/BlazorStrap/Components/Forms/BSFormGroup.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSFormGroupBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Forms/BSFormGroup.razor.cs b/src/BlazorStrap/Components/Forms/BSFormGroup.razor.cs
index 971ace63..63903ec8 100644
--- a/src/BlazorStrap/Components/Forms/BSFormGroup.razor.cs
+++ b/src/BlazorStrap/Components/Forms/BSFormGroup.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSFormGroupBase : ComponentBase
+    public partial class BSFormGroup : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Forms/BSFormLabel.razor b/src/BlazorStrap/Components/Forms/BSFormLabel.razor
index 7039f2f4..b4e80c5f 100644
--- a/src/BlazorStrap/Components/Forms/BSFormLabel.razor
+++ b/src/BlazorStrap/Components/Forms/BSFormLabel.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSFormLabelBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="label" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Forms/BSFormLabel.razor.cs b/src/BlazorStrap/Components/Forms/BSFormLabel.razor.cs
index 43f5737b..eb19ec08 100644
--- a/src/BlazorStrap/Components/Forms/BSFormLabel.razor.cs
+++ b/src/BlazorStrap/Components/Forms/BSFormLabel.razor.cs
@@ -5,7 +5,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSFormLabelBase : ComponentBase
+    public partial class BSFormLabel : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Forms/BSLabel.razor b/src/BlazorStrap/Components/Forms/BSLabel.razor
index b2d26bf0..f20abae2 100644
--- a/src/BlazorStrap/Components/Forms/BSLabel.razor
+++ b/src/BlazorStrap/Components/Forms/BSLabel.razor
@@ -1,8 +1,8 @@
 @namespace BlazorStrap
-@inherits BSLabelBase
+@inherits ColumnBase
 
-    <CascadingValue Value="this">
-        <DynamicElement @attributes="@UnknownParameters" TagName="label" class="@Classname">
-            @ChildContent
-        </DynamicElement>
-    </CascadingValue>
+<CascadingValue Value="this">
+    <DynamicElement @attributes="@UnknownParameters" TagName="label" class="@Classname">
+        @ChildContent
+    </DynamicElement>
+</CascadingValue>
diff --git a/src/BlazorStrap/Components/Forms/BSLabel.razor.cs b/src/BlazorStrap/Components/Forms/BSLabel.razor.cs
index b55728e6..f48e107a 100644
--- a/src/BlazorStrap/Components/Forms/BSLabel.razor.cs
+++ b/src/BlazorStrap/Components/Forms/BSLabel.razor.cs
@@ -6,7 +6,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSLabelBase : ColumnBase
+    public partial class BSLabel : ColumnBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Layout/BSBreadcrumb.razor b/src/BlazorStrap/Components/Layout/BSBreadcrumb.razor
index e0f05ad5..22e10ebc 100644
--- a/src/BlazorStrap/Components/Layout/BSBreadcrumb.razor
+++ b/src/BlazorStrap/Components/Layout/BSBreadcrumb.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSBreadcrumbBase
 
 <nav aria-label="breadcrumb">
     <DynamicElement @attributes="@UnknownParameters" TagName="ol" class="@Classname">
diff --git a/src/BlazorStrap/Components/Layout/BSBreadcrumb.razor.cs b/src/BlazorStrap/Components/Layout/BSBreadcrumb.razor.cs
index 0ec797f0..54d9ff73 100644
--- a/src/BlazorStrap/Components/Layout/BSBreadcrumb.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSBreadcrumb.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSBreadcrumbBase : ComponentBase
+    public partial class BSBreadcrumb : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Layout/BSBreadcrumbItem.razor b/src/BlazorStrap/Components/Layout/BSBreadcrumbItem.razor
index 02587aab..58f5e581 100644
--- a/src/BlazorStrap/Components/Layout/BSBreadcrumbItem.razor
+++ b/src/BlazorStrap/Components/Layout/BSBreadcrumbItem.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSBreadcrumbItemBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="li" class="@Classname" aria-current="@aria">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSBreadcrumbItem.razor.cs b/src/BlazorStrap/Components/Layout/BSBreadcrumbItem.razor.cs
index f6693168..3b9aecf2 100644
--- a/src/BlazorStrap/Components/Layout/BSBreadcrumbItem.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSBreadcrumbItem.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSBreadcrumbItemBase : ComponentBase
+    public partial class BSBreadcrumbItem : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Layout/BSCard.razor b/src/BlazorStrap/Components/Layout/BSCard.razor
index 8a23076e..cac72ffd 100644
--- a/src/BlazorStrap/Components/Layout/BSCard.razor
+++ b/src/BlazorStrap/Components/Layout/BSCard.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSCardBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSCard.razor.cs b/src/BlazorStrap/Components/Layout/BSCard.razor.cs
index cbe4818b..4011f9e7 100644
--- a/src/BlazorStrap/Components/Layout/BSCard.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSCard.razor.cs
@@ -5,7 +5,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSCardBase : ComponentBase
+    public partial class BSCard : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Layout/BSCol.razor b/src/BlazorStrap/Components/Layout/BSCol.razor
index 0ca11cd6..b51efd55 100644
--- a/src/BlazorStrap/Components/Layout/BSCol.razor
+++ b/src/BlazorStrap/Components/Layout/BSCol.razor
@@ -1,5 +1,5 @@
 @namespace BlazorStrap
-@inherits BSColBase
+@inherits ColumnBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSCol.razor.cs b/src/BlazorStrap/Components/Layout/BSCol.razor.cs
index 51490fcc..50e1b9ae 100644
--- a/src/BlazorStrap/Components/Layout/BSCol.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSCol.razor.cs
@@ -5,7 +5,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSColBase : ColumnBase
+    public partial class BSCol : ColumnBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
diff --git a/src/BlazorStrap/Components/Layout/BSCollapse.razor b/src/BlazorStrap/Components/Layout/BSCollapse.razor
index f8c77adf..968ba0e1 100644
--- a/src/BlazorStrap/Components/Layout/BSCollapse.razor
+++ b/src/BlazorStrap/Components/Layout/BSCollapse.razor
@@ -1,5 +1,5 @@
 @namespace BlazorStrap
-@inherits BSCollapseBase
+@inherits ToggleableComponentBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname" @bind-ElementRef="MyRef" @ontransitionend="AnimationEnd">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSCollapse.razor.cs b/src/BlazorStrap/Components/Layout/BSCollapse.razor.cs
index 21d563d8..8aacf5b2 100644
--- a/src/BlazorStrap/Components/Layout/BSCollapse.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSCollapse.razor.cs
@@ -7,7 +7,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSCollapseBase : ToggleableComponentBase
+    public partial class BSCollapse : ToggleableComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         [Parameter] public EventCallback<BSCollapseEvent> ShowEvent { get; set; }
diff --git a/src/BlazorStrap/Components/Layout/BSCollapseEvent.cs b/src/BlazorStrap/Components/Layout/BSCollapseEvent.cs
index 190f1255..cb89ce1a 100644
--- a/src/BlazorStrap/Components/Layout/BSCollapseEvent.cs
+++ b/src/BlazorStrap/Components/Layout/BSCollapseEvent.cs
@@ -2,6 +2,6 @@
 {
     public class BSCollapseEvent
     {
-        public BSCollapseBase Target { get; set; }
+        public BSCollapse Target { get; set; }
     }
 }
diff --git a/src/BlazorStrap/Components/Layout/BSCollapseGroup.razor b/src/BlazorStrap/Components/Layout/BSCollapseGroup.razor
index 3b18408c..a8921e41 100644
--- a/src/BlazorStrap/Components/Layout/BSCollapseGroup.razor
+++ b/src/BlazorStrap/Components/Layout/BSCollapseGroup.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSCollapseGroupBase
 
 <CascadingValue Value="@this">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSCollapseGroup.razor.cs b/src/BlazorStrap/Components/Layout/BSCollapseGroup.razor.cs
index cec9333c..d7d2eaeb 100644
--- a/src/BlazorStrap/Components/Layout/BSCollapseGroup.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSCollapseGroup.razor.cs
@@ -2,7 +2,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSCollapseGroupBase : ComponentBase
+    public partial class BSCollapseGroup : ComponentBase
     {
         [Parameter] public RenderFragment ChildContent { get; set; }
 
diff --git a/src/BlazorStrap/Components/Layout/BSCollapseItem.razor b/src/BlazorStrap/Components/Layout/BSCollapseItem.razor
index e8fedad9..406d7aad 100644
--- a/src/BlazorStrap/Components/Layout/BSCollapseItem.razor
+++ b/src/BlazorStrap/Components/Layout/BSCollapseItem.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSCollapseItemBase
 
 <CascadingValue Value="@this">
             @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSCollapseItem.razor.cs b/src/BlazorStrap/Components/Layout/BSCollapseItem.razor.cs
index c9c30598..9fa5551f 100644
--- a/src/BlazorStrap/Components/Layout/BSCollapseItem.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSCollapseItem.razor.cs
@@ -2,10 +2,10 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSCollapseItemBase : ComponentBase
+    public partial class BSCollapseItem : ComponentBase
     {
         [Parameter] public RenderFragment ChildContent { get; set; }
-        internal BSCollapseBase Collapse { get; set; }
+        internal BSCollapse Collapse { get; set; }
 
         private bool _active = false;
         public bool Active
diff --git a/src/BlazorStrap/Components/Layout/BSCollapseToggle.razor b/src/BlazorStrap/Components/Layout/BSCollapseToggle.razor
index e9647e6c..300a74bc 100644
--- a/src/BlazorStrap/Components/Layout/BSCollapseToggle.razor
+++ b/src/BlazorStrap/Components/Layout/BSCollapseToggle.razor
@@ -1,6 +1,5 @@
 @namespace BlazorStrap
-@inherits BSCollapseToggleBase
 
-        <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname" href="@href" type="@Type" @onclick="OnClickEvent" aria-expanded="@CollapseItem?.Collapse?.IsOpen.ToString().ToLower()">
-            @ChildContent(CollapseItem?.Collapse?.IsOpen ?? false)
-        </DynamicElement>
+<DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname" href="@href" type="@Type" @onclick="OnClickEvent" aria-expanded="@CollapseItem?.Collapse?.IsOpen.ToString().ToLower()">
+    @ChildContent(CollapseItem?.Collapse?.IsOpen ?? false)
+</DynamicElement>
diff --git a/src/BlazorStrap/Components/Layout/BSCollapseToggle.razor.cs b/src/BlazorStrap/Components/Layout/BSCollapseToggle.razor.cs
index 633f1194..ec67e751 100644
--- a/src/BlazorStrap/Components/Layout/BSCollapseToggle.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSCollapseToggle.razor.cs
@@ -5,7 +5,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSCollapseToggleBase : ComponentBase
+    public partial class BSCollapseToggle : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Layout/BSContainer.razor b/src/BlazorStrap/Components/Layout/BSContainer.razor
index 4b7f62c3..7f3c1932 100644
--- a/src/BlazorStrap/Components/Layout/BSContainer.razor
+++ b/src/BlazorStrap/Components/Layout/BSContainer.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSContainerBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSContainer.razor.cs b/src/BlazorStrap/Components/Layout/BSContainer.razor.cs
index 090839de..2a3aef46 100644
--- a/src/BlazorStrap/Components/Layout/BSContainer.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSContainer.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSContainerBase : ComponentBase
+    public partial class BSContainer : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Layout/BSFigure.razor b/src/BlazorStrap/Components/Layout/BSFigure.razor
index e4ae9fa1..3a3060da 100644
--- a/src/BlazorStrap/Components/Layout/BSFigure.razor
+++ b/src/BlazorStrap/Components/Layout/BSFigure.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSFigureBase
 
 <DynamicElement TagName="figure" class="@Classname" style="@Style" @attributes="@UnknownParameters">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSFigure.razor.cs b/src/BlazorStrap/Components/Layout/BSFigure.razor.cs
index d1c40ef2..e432e4c7 100644
--- a/src/BlazorStrap/Components/Layout/BSFigure.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSFigure.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSFigureBase : ComponentBase
+    public partial class BSFigure : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Layout/BSFormRow.razor b/src/BlazorStrap/Components/Layout/BSFormRow.razor
index 610be533..f45ddc1b 100644
--- a/src/BlazorStrap/Components/Layout/BSFormRow.razor
+++ b/src/BlazorStrap/Components/Layout/BSFormRow.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSFormRowBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSFormRow.razor.cs b/src/BlazorStrap/Components/Layout/BSFormRow.razor.cs
index 99b47d61..1a09d2dc 100644
--- a/src/BlazorStrap/Components/Layout/BSFormRow.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSFormRow.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSFormRowBase : ComponentBase
+    public partial class BSFormRow : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Layout/BSListItem.razor b/src/BlazorStrap/Components/Layout/BSListItem.razor
index 681f0ed3..55821aaf 100644
--- a/src/BlazorStrap/Components/Layout/BSListItem.razor
+++ b/src/BlazorStrap/Components/Layout/BSListItem.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSListItemBase
 
     <CascadingValue Value="this">
         <DynamicElement @attributes="@UnknownParameters" TagName="li" class="@Classname">
diff --git a/src/BlazorStrap/Components/Layout/BSListItem.razor.cs b/src/BlazorStrap/Components/Layout/BSListItem.razor.cs
index 6d423e39..c580cda6 100644
--- a/src/BlazorStrap/Components/Layout/BSListItem.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSListItem.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSListItemBase : ComponentBase
+    public partial class BSListItem : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         [Parameter] public RenderFragment ChildContent { get; set; }
diff --git a/src/BlazorStrap/Components/Layout/BSRow.razor b/src/BlazorStrap/Components/Layout/BSRow.razor
index 671fbe31..f45ddc1b 100644
--- a/src/BlazorStrap/Components/Layout/BSRow.razor
+++ b/src/BlazorStrap/Components/Layout/BSRow.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSRowBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSRow.razor.cs b/src/BlazorStrap/Components/Layout/BSRow.razor.cs
index 91712c96..4a5eeecc 100644
--- a/src/BlazorStrap/Components/Layout/BSRow.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSRow.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSRowBase : ComponentBase
+    public partial class BSRow : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Layout/BSTable.razor b/src/BlazorStrap/Components/Layout/BSTable.razor
index bfdadbbb..ac06bf4a 100644
--- a/src/BlazorStrap/Components/Layout/BSTable.razor
+++ b/src/BlazorStrap/Components/Layout/BSTable.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSTableBase
 
 @if (IsResponsive)
 {
diff --git a/src/BlazorStrap/Components/Layout/BSTable.razor.cs b/src/BlazorStrap/Components/Layout/BSTable.razor.cs
index 73a2a5a6..aee9a6fe 100644
--- a/src/BlazorStrap/Components/Layout/BSTable.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSTable.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTableBase : ComponentBase
+    public partial class BSTable : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Layout/BSTableBody.razor b/src/BlazorStrap/Components/Layout/BSTableBody.razor
index ff052848..d2a66888 100644
--- a/src/BlazorStrap/Components/Layout/BSTableBody.razor
+++ b/src/BlazorStrap/Components/Layout/BSTableBody.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSTableBodyBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="tbody">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSTableBody.razor.cs b/src/BlazorStrap/Components/Layout/BSTableBody.razor.cs
index b2589dd8..e4c50e67 100644
--- a/src/BlazorStrap/Components/Layout/BSTableBody.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSTableBody.razor.cs
@@ -3,7 +3,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTableBodyBase : ComponentBase
+    public partial class BSTableBody : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         [Parameter] public RenderFragment ChildContent { get; set; }
diff --git a/src/BlazorStrap/Components/Layout/BSTableCell.razor b/src/BlazorStrap/Components/Layout/BSTableCell.razor
index 57400651..ced016fb 100644
--- a/src/BlazorStrap/Components/Layout/BSTableCell.razor
+++ b/src/BlazorStrap/Components/Layout/BSTableCell.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSTableCellBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="td" class="@Classname" @onclick="OnClickEvent" OnClickPreventDefault="OnClickPreventDefault" OnClickStopPropagation="OnClickStopPropagation">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSTableCell.razor.cs b/src/BlazorStrap/Components/Layout/BSTableCell.razor.cs
index 5ca4d956..8a191c70 100644
--- a/src/BlazorStrap/Components/Layout/BSTableCell.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSTableCell.razor.cs
@@ -6,7 +6,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTableCellBase : ComponentBase
+    public partial class BSTableCell : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Layout/BSTableFooter.razor b/src/BlazorStrap/Components/Layout/BSTableFooter.razor
index f43885d5..3a5ba047 100644
--- a/src/BlazorStrap/Components/Layout/BSTableFooter.razor
+++ b/src/BlazorStrap/Components/Layout/BSTableFooter.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSTableFooterBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="tfoot">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSTableFooter.razor.cs b/src/BlazorStrap/Components/Layout/BSTableFooter.razor.cs
index 18b604dc..7ec9476d 100644
--- a/src/BlazorStrap/Components/Layout/BSTableFooter.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSTableFooter.razor.cs
@@ -3,7 +3,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTableFooterBase : ComponentBase
+    public partial class BSTableFooter : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         [Parameter] public RenderFragment ChildContent { get; set; }
diff --git a/src/BlazorStrap/Components/Layout/BSTableHead.razor b/src/BlazorStrap/Components/Layout/BSTableHead.razor
index 108e26c9..e1724cb9 100644
--- a/src/BlazorStrap/Components/Layout/BSTableHead.razor
+++ b/src/BlazorStrap/Components/Layout/BSTableHead.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSTableHeadBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="thead" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSTableHead.razor.cs b/src/BlazorStrap/Components/Layout/BSTableHead.razor.cs
index 73f1c8c2..7a736cc0 100644
--- a/src/BlazorStrap/Components/Layout/BSTableHead.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSTableHead.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTableHeadBase : ComponentBase
+    public partial class BSTableHead : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Layout/BSTableHeadCell.razor b/src/BlazorStrap/Components/Layout/BSTableHeadCell.razor
index 019e0e67..542dcb7a 100644
--- a/src/BlazorStrap/Components/Layout/BSTableHeadCell.razor
+++ b/src/BlazorStrap/Components/Layout/BSTableHeadCell.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits CodeSTableHeadCellBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="th" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSTableHeadCell.razor.cs b/src/BlazorStrap/Components/Layout/BSTableHeadCell.razor.cs
index 47a39b4a..436115d3 100644
--- a/src/BlazorStrap/Components/Layout/BSTableHeadCell.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSTableHeadCell.razor.cs
@@ -5,7 +5,7 @@
 
 namespace BlazorStrap
 {
-    public class CodeSTableHeadCellBase : ComponentBase
+    public partial class BSTableHeadCell : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Layout/BSTableRow.razor b/src/BlazorStrap/Components/Layout/BSTableRow.razor
index c5a337ba..c837f849 100644
--- a/src/BlazorStrap/Components/Layout/BSTableRow.razor
+++ b/src/BlazorStrap/Components/Layout/BSTableRow.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSTableRowBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="tr" class="@Classname" @onclick="OnClickEvent" OnClickPreventDefault="OnClickPreventDefault" OnClickStopPropagation="OnClickStopPropagation">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Layout/BSTableRow.razor.cs b/src/BlazorStrap/Components/Layout/BSTableRow.razor.cs
index 8051b3a3..d5b43023 100644
--- a/src/BlazorStrap/Components/Layout/BSTableRow.razor.cs
+++ b/src/BlazorStrap/Components/Layout/BSTableRow.razor.cs
@@ -6,7 +6,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTableRowBase : ComponentBase
+    public partial class BSTableRow : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/ListGroup/BSListGroup.razor b/src/BlazorStrap/Components/ListGroup/BSListGroup.razor
index bb5f48de..88269d78 100644
--- a/src/BlazorStrap/Components/ListGroup/BSListGroup.razor
+++ b/src/BlazorStrap/Components/ListGroup/BSListGroup.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSListGroupBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/ListGroup/BSListGroup.razor.cs b/src/BlazorStrap/Components/ListGroup/BSListGroup.razor.cs
index 8bbc4e98..3cf78084 100644
--- a/src/BlazorStrap/Components/ListGroup/BSListGroup.razor.cs
+++ b/src/BlazorStrap/Components/ListGroup/BSListGroup.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSListGroupBase : ComponentBase
+    public partial class BSListGroup : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/ListGroup/BSListGroupItem.razor b/src/BlazorStrap/Components/ListGroup/BSListGroupItem.razor
index 66b8366c..a86aa3fe 100644
--- a/src/BlazorStrap/Components/ListGroup/BSListGroupItem.razor
+++ b/src/BlazorStrap/Components/ListGroup/BSListGroupItem.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSListGroupItemBase
 
 <DynamicElement @attributes="@UnknownParameters" href="@(Href != null && Href != "#" ? Href : href)" TagName="@Tag" class="@Classname" @onclick="OnClick" disabled="@IsDisabled" type="@IsButton">
     @ChildContent
diff --git a/src/BlazorStrap/Components/ListGroup/BSListGroupItem.razor.cs b/src/BlazorStrap/Components/ListGroup/BSListGroupItem.razor.cs
index e4388294..9d5e59c4 100644
--- a/src/BlazorStrap/Components/ListGroup/BSListGroupItem.razor.cs
+++ b/src/BlazorStrap/Components/ListGroup/BSListGroupItem.razor.cs
@@ -6,7 +6,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSListGroupItemBase : ComponentBase
+    public partial class BSListGroupItem : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/ListGroup/BSListGroupItemHeading.razor b/src/BlazorStrap/Components/ListGroup/BSListGroupItemHeading.razor
index 8d452384..7f3c1932 100644
--- a/src/BlazorStrap/Components/ListGroup/BSListGroupItemHeading.razor
+++ b/src/BlazorStrap/Components/ListGroup/BSListGroupItemHeading.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSListGroupItemHeadingBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/ListGroup/BSListGroupItemHeading.razor.cs b/src/BlazorStrap/Components/ListGroup/BSListGroupItemHeading.razor.cs
index 5faad69a..2d08df68 100644
--- a/src/BlazorStrap/Components/ListGroup/BSListGroupItemHeading.razor.cs
+++ b/src/BlazorStrap/Components/ListGroup/BSListGroupItemHeading.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSListGroupItemHeadingBase : ComponentBase
+    public partial class BSListGroupItemHeading : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/ListGroup/BSListGroupItemText.razor b/src/BlazorStrap/Components/ListGroup/BSListGroupItemText.razor
index 4543e3ec..7f3c1932 100644
--- a/src/BlazorStrap/Components/ListGroup/BSListGroupItemText.razor
+++ b/src/BlazorStrap/Components/ListGroup/BSListGroupItemText.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSListGroupItemTextBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/ListGroup/BSListGroupItemText.razor.cs b/src/BlazorStrap/Components/ListGroup/BSListGroupItemText.razor.cs
index de780d2c..f7fd6556 100644
--- a/src/BlazorStrap/Components/ListGroup/BSListGroupItemText.razor.cs
+++ b/src/BlazorStrap/Components/ListGroup/BSListGroupItemText.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSListGroupItemTextBase : ComponentBase
+    public partial class BSListGroupItemText : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Media/BSImage.razor b/src/BlazorStrap/Components/Media/BSImage.razor
index f1d6fb71..375b01d9 100644
--- a/src/BlazorStrap/Components/Media/BSImage.razor
+++ b/src/BlazorStrap/Components/Media/BSImage.razor
@@ -1,4 +1,3 @@
 @namespace BlazorStrap
-@inherits BSImageBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="img" class="@Classname" />
diff --git a/src/BlazorStrap/Components/Media/BSImage.razor.cs b/src/BlazorStrap/Components/Media/BSImage.razor.cs
index 1845a9d8..4d79b421 100644
--- a/src/BlazorStrap/Components/Media/BSImage.razor.cs
+++ b/src/BlazorStrap/Components/Media/BSImage.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSImageBase : ComponentBase
+    public partial class BSImage : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Media/BSJumbotron.razor b/src/BlazorStrap/Components/Media/BSJumbotron.razor
index 7c470bdc..7f3c1932 100644
--- a/src/BlazorStrap/Components/Media/BSJumbotron.razor
+++ b/src/BlazorStrap/Components/Media/BSJumbotron.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSJumbotronBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Media/BSJumbotron.razor.cs b/src/BlazorStrap/Components/Media/BSJumbotron.razor.cs
index dc7e5dc0..870eb698 100644
--- a/src/BlazorStrap/Components/Media/BSJumbotron.razor.cs
+++ b/src/BlazorStrap/Components/Media/BSJumbotron.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSJumbotronBase : ComponentBase
+    public partial class BSJumbotron : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Media/BSMedia.razor b/src/BlazorStrap/Components/Media/BSMedia.razor
index 761166a5..88269d78 100644
--- a/src/BlazorStrap/Components/Media/BSMedia.razor
+++ b/src/BlazorStrap/Components/Media/BSMedia.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSMediaBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Media/BSMedia.razor.cs b/src/BlazorStrap/Components/Media/BSMedia.razor.cs
index b1890457..5a356652 100644
--- a/src/BlazorStrap/Components/Media/BSMedia.razor.cs
+++ b/src/BlazorStrap/Components/Media/BSMedia.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSMediaBase : ComponentBase
+    public partial class BSMedia : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Model/BSModalBody.razor b/src/BlazorStrap/Components/Model/BSModalBody.razor
index 34e41a09..7f3c1932 100644
--- a/src/BlazorStrap/Components/Model/BSModalBody.razor
+++ b/src/BlazorStrap/Components/Model/BSModalBody.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSModalBodyBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Model/BSModalBody.razor.cs b/src/BlazorStrap/Components/Model/BSModalBody.razor.cs
index 514bb68f..0a764219 100644
--- a/src/BlazorStrap/Components/Model/BSModalBody.razor.cs
+++ b/src/BlazorStrap/Components/Model/BSModalBody.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSModalBodyBase : ComponentBase
+    public partial class BSModalBody : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Model/BSModalFooter.razor b/src/BlazorStrap/Components/Model/BSModalFooter.razor
index bbdeace8..7f3c1932 100644
--- a/src/BlazorStrap/Components/Model/BSModalFooter.razor
+++ b/src/BlazorStrap/Components/Model/BSModalFooter.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSModalFooterBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Model/BSModalFooter.razor.cs b/src/BlazorStrap/Components/Model/BSModalFooter.razor.cs
index 7ad09e7b..70072dff 100644
--- a/src/BlazorStrap/Components/Model/BSModalFooter.razor.cs
+++ b/src/BlazorStrap/Components/Model/BSModalFooter.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSModalFooterBase : ComponentBase
+    public partial class BSModalFooter : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Model/BSModalHeader.razor b/src/BlazorStrap/Components/Model/BSModalHeader.razor
index 771ec4ef..765e58bf 100644
--- a/src/BlazorStrap/Components/Model/BSModalHeader.razor
+++ b/src/BlazorStrap/Components/Model/BSModalHeader.razor
@@ -1,9 +1,11 @@
 @namespace BlazorStrap
-@inherits BSModalHeaderBase
 
-<DynamicElement @attributes="@UnknownParameters" TagName="div" class="@divClassname">
-    <h5 class="@headingClassname">@ChildContent</h5>
+<DynamicElement @attributes="@UnknownParameters" TagName="div" class="@DivClassname">
+    <h5 class="@HeadingClassname">@ChildContent</h5>
+    @if (!HideCloseButton)
+    {
     <button type="button" class="close" aria-label="Close" @onclick="OnClick">
         <span aria-hidden="true">&times;</span>
     </button>
+    }
 </DynamicElement>
\ No newline at end of file
diff --git a/src/BlazorStrap/Components/Model/BSModalHeader.razor.cs b/src/BlazorStrap/Components/Model/BSModalHeader.razor.cs
index 3ed97fe0..97dfbd33 100644
--- a/src/BlazorStrap/Components/Model/BSModalHeader.razor.cs
+++ b/src/BlazorStrap/Components/Model/BSModalHeader.razor.cs
@@ -5,21 +5,22 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSModalHeaderBase : ComponentBase
+    public partial class BSModalHeader : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
-        protected string divClassname =>
+        protected string DivClassname =>
             new CssBuilder("modal-header")
                 .AddClass(Class)
             .Build();
 
-        protected string headingClassname =>
+        protected string HeadingClassname =>
             new CssBuilder("modal-title")
                 .AddClass(HeadingClass)
             .Build();
 
         [Parameter] public EventCallback<MouseEventArgs> OnClick { get; set; }
         [Parameter] public string Class { get; set; }
+        [Parameter] public bool HideCloseButton { get; set; }
         [Parameter] public string HeadingClass { get; set; }
         [Parameter] public RenderFragment ChildContent { get; set; }
 
diff --git a/src/BlazorStrap/Components/Nav/BSNav.razor b/src/BlazorStrap/Components/Nav/BSNav.razor
index c31e04d4..3b3a8c4e 100644
--- a/src/BlazorStrap/Components/Nav/BSNav.razor
+++ b/src/BlazorStrap/Components/Nav/BSNav.razor
@@ -1,8 +1,7 @@
 @namespace BlazorStrap
-@inherits BSNavBase
 
 <CascadingValue Value="@this">
-    <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname" >
+    <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname">
         @ChildContent
     </DynamicElement>
 </CascadingValue>
\ No newline at end of file
diff --git a/src/BlazorStrap/Components/Nav/BSNav.razor.cs b/src/BlazorStrap/Components/Nav/BSNav.razor.cs
index 7a70a4cb..4659a284 100644
--- a/src/BlazorStrap/Components/Nav/BSNav.razor.cs
+++ b/src/BlazorStrap/Components/Nav/BSNav.razor.cs
@@ -5,13 +5,13 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSNavBase : ComponentBase, IDisposable
+    public partial class BSNav : ComponentBase, IDisposable
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
-        private BSNavItemBase _selected;
+        private BSNavItem _selected;
         private bool _disposed;
-        internal List<BSNavItemBase> Navitems { get; set; } = new List<BSNavItemBase>();
-        public BSNavItemBase Selected
+        internal List<BSNavItem> Navitems { get; set; } = new List<BSNavItem>();
+        public BSNavItem Selected
         {
             get => _selected;
             set
diff --git a/src/BlazorStrap/Components/Nav/BSNavItem.razor b/src/BlazorStrap/Components/Nav/BSNavItem.razor
index f23f296d..4c67410f 100644
--- a/src/BlazorStrap/Components/Nav/BSNavItem.razor
+++ b/src/BlazorStrap/Components/Nav/BSNavItem.razor
@@ -1,10 +1,9 @@
 @namespace BlazorStrap
-@inherits BSNavItemBase
-
-    <CascadingValue Value="@this">
-        <CascadingValue Value="@DropDownMenu">
-            <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname" @onfocusout="LostFocus" @onmouseleave="MouseLeave" @onmouseenter="MouseEnter">
-                @ChildContent
-            </DynamicElement>
-        </CascadingValue>
+@inherits ToggleableComponentBase
+<CascadingValue Value="@this">
+    <CascadingValue Value="@DropDownMenu">
+        <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname" @onfocusout="LostFocus" @onmouseleave="MouseLeave" @onmouseenter="MouseEnter">
+            @ChildContent
+        </DynamicElement>
     </CascadingValue>
+</CascadingValue>
diff --git a/src/BlazorStrap/Components/Nav/BSNavItem.razor.cs b/src/BlazorStrap/Components/Nav/BSNavItem.razor.cs
index 9f71b6cb..7647b027 100644
--- a/src/BlazorStrap/Components/Nav/BSNavItem.razor.cs
+++ b/src/BlazorStrap/Components/Nav/BSNavItem.razor.cs
@@ -7,18 +7,18 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSNavItemBase : ToggleableComponentBase, IDisposable
+    public partial class BSNavItem : ToggleableComponentBase, IDisposable
     {
         internal bool IsSubmenu { get; set; }
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
 
-        private BSDropdownMenuBase _selected;
+        private BSDropdownMenu _selected;
         private bool _shouldClose { get; set; } = false;
 
         //Prevents NULL
-        private BSDropdownMenuBase _dropDownMenu { get; set; } = new BSDropdownMenu();
+        private BSDropdownMenu _dropDownMenu { get; set; } = new BSDropdownMenu();
 
-        public BSDropdownMenuBase DropDownMenu
+        public BSDropdownMenu DropDownMenu
         {
             get => _dropDownMenu;
             set
@@ -28,7 +28,7 @@ public BSDropdownMenuBase DropDownMenu
             }
         }
 
-        public BSDropdownMenuBase Selected
+        public BSDropdownMenu Selected
         {
             get
             {
diff --git a/src/BlazorStrap/Components/Nav/BSNavLink.razor b/src/BlazorStrap/Components/Nav/BSNavLink.razor
index a6f6df43..ab354538 100644
--- a/src/BlazorStrap/Components/Nav/BSNavLink.razor
+++ b/src/BlazorStrap/Components/Nav/BSNavLink.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSNavLinkBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="a" class="@Classname" disabled="@Disabled" href="@Href">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Nav/BSNavLink.razor.cs b/src/BlazorStrap/Components/Nav/BSNavLink.razor.cs
index 65ffea60..4158316d 100644
--- a/src/BlazorStrap/Components/Nav/BSNavLink.razor.cs
+++ b/src/BlazorStrap/Components/Nav/BSNavLink.razor.cs
@@ -7,7 +7,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSNavLinkBase : ComponentBase, IDisposable
+    public partial class BSNavLink : ComponentBase, IDisposable
     {
         [Inject] protected NavigationManager UriHelper { get; set; }
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
diff --git a/src/BlazorStrap/Components/Nav/BSNavbar.razor b/src/BlazorStrap/Components/Nav/BSNavbar.razor
index 11e54b25..10a3d273 100644
--- a/src/BlazorStrap/Components/Nav/BSNavbar.razor
+++ b/src/BlazorStrap/Components/Nav/BSNavbar.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSNavbarBase
 
     <CascadingValue Value="this">
         <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname">
diff --git a/src/BlazorStrap/Components/Nav/BSNavbar.razor.cs b/src/BlazorStrap/Components/Nav/BSNavbar.razor.cs
index cbe42371..ae443fe6 100644
--- a/src/BlazorStrap/Components/Nav/BSNavbar.razor.cs
+++ b/src/BlazorStrap/Components/Nav/BSNavbar.razor.cs
@@ -7,7 +7,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSNavbarBase : ComponentBase
+    public partial class BSNavbar : ComponentBase
     {
         [Parameter] public bool Header { get; set; }
         [Parameter] public RenderFragment ChildContent { get; set; }
diff --git a/src/BlazorStrap/Components/Nav/BSNavbarBrand.razor b/src/BlazorStrap/Components/Nav/BSNavbarBrand.razor
index cf89b1e0..1c0fc56b 100644
--- a/src/BlazorStrap/Components/Nav/BSNavbarBrand.razor
+++ b/src/BlazorStrap/Components/Nav/BSNavbarBrand.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSNavbarBrandBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="a" class="@Classname" >
     @ChildContent
diff --git a/src/BlazorStrap/Components/Nav/BSNavbarBrand.razor.cs b/src/BlazorStrap/Components/Nav/BSNavbarBrand.razor.cs
index 649c2e8f..f216d646 100644
--- a/src/BlazorStrap/Components/Nav/BSNavbarBrand.razor.cs
+++ b/src/BlazorStrap/Components/Nav/BSNavbarBrand.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSNavbarBrandBase : ComponentBase
+    public partial class BSNavbarBrand : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Nav/BSNavbarToggler.razor b/src/BlazorStrap/Components/Nav/BSNavbarToggler.razor
index 19fd1257..fa2ef8a4 100644
--- a/src/BlazorStrap/Components/Nav/BSNavbarToggler.razor
+++ b/src/BlazorStrap/Components/Nav/BSNavbarToggler.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSNavbarTogglerBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="button" class="@Classname" aria-label="Toggle navigation" @onclick="Clicked">
     <span class="navbar-toggler-icon"></span>
diff --git a/src/BlazorStrap/Components/Nav/BSNavbarToggler.razor.cs b/src/BlazorStrap/Components/Nav/BSNavbarToggler.razor.cs
index 02ffb7e8..084f6cb5 100644
--- a/src/BlazorStrap/Components/Nav/BSNavbarToggler.razor.cs
+++ b/src/BlazorStrap/Components/Nav/BSNavbarToggler.razor.cs
@@ -6,7 +6,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSNavbarTogglerBase : ComponentBase
+    public partial class BSNavbarToggler : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Pagination/BSPagination.razor b/src/BlazorStrap/Components/Pagination/BSPagination.razor
index bf42e48e..8a5d4640 100644
--- a/src/BlazorStrap/Components/Pagination/BSPagination.razor
+++ b/src/BlazorStrap/Components/Pagination/BSPagination.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSPaginationBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="nav" aria-label="Pagination" >
     <ul class="@Classname" style="@Style">
diff --git a/src/BlazorStrap/Components/Pagination/BSPagination.razor.cs b/src/BlazorStrap/Components/Pagination/BSPagination.razor.cs
index 6736d72a..5532da94 100644
--- a/src/BlazorStrap/Components/Pagination/BSPagination.razor.cs
+++ b/src/BlazorStrap/Components/Pagination/BSPagination.razor.cs
@@ -5,7 +5,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSPaginationBase : ComponentBase
+    public partial class BSPagination : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Pagination/BSPaginationItem.razor b/src/BlazorStrap/Components/Pagination/BSPaginationItem.razor
index ddea1ecd..fb7eca83 100644
--- a/src/BlazorStrap/Components/Pagination/BSPaginationItem.razor
+++ b/src/BlazorStrap/Components/Pagination/BSPaginationItem.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSPaginationItemBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="li" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Pagination/BSPaginationItem.razor.cs b/src/BlazorStrap/Components/Pagination/BSPaginationItem.razor.cs
index c9801b8b..2cc5ca80 100644
--- a/src/BlazorStrap/Components/Pagination/BSPaginationItem.razor.cs
+++ b/src/BlazorStrap/Components/Pagination/BSPaginationItem.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSPaginationItemBase : ComponentBase
+    public partial class BSPaginationItem : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Pagination/BSPaginationLink.razor b/src/BlazorStrap/Components/Pagination/BSPaginationLink.razor
index 4182210e..eb7c5476 100644
--- a/src/BlazorStrap/Components/Pagination/BSPaginationLink.razor
+++ b/src/BlazorStrap/Components/Pagination/BSPaginationLink.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSPaginationLinkBase
 
     <DynamicElement @attributes="@UnknownParameters" TagName="a" class="@Classname" href="@Href" OnClickPreventDefault="OnClickPreventDefault" OnClickStopPropagation="OnClickStopPropagation">
         @if (PaginationLinkType == PaginationLinkType.Custom)
diff --git a/src/BlazorStrap/Components/Pagination/BSPaginationLink.razor.cs b/src/BlazorStrap/Components/Pagination/BSPaginationLink.razor.cs
index 9e39f958..5b9edb25 100644
--- a/src/BlazorStrap/Components/Pagination/BSPaginationLink.razor.cs
+++ b/src/BlazorStrap/Components/Pagination/BSPaginationLink.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSPaginationLinkBase : ComponentBase
+    public partial class BSPaginationLink : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
@@ -17,7 +17,7 @@ public abstract class BSPaginationLinkBase : ComponentBase
         [Parameter] public bool OnClickPreventDefault { get; set; } = false;
 
         [Parameter] public PaginationLinkType PaginationLinkType { get; set; } = PaginationLinkType.Custom;
-        private string label
+        private string _label
         {
             get
             {
@@ -26,7 +26,7 @@ private string label
                 return null;
             }
         }
-        private string sr
+        private string _sr
         {
             get
             {
diff --git a/src/BlazorStrap/Components/Popover/BSPopover.razor b/src/BlazorStrap/Components/Popover/BSPopover.razor
index 7644c4e6..b4926f3a 100644
--- a/src/BlazorStrap/Components/Popover/BSPopover.razor
+++ b/src/BlazorStrap/Components/Popover/BSPopover.razor
@@ -1,5 +1,5 @@
 @namespace BlazorStrap
-@inherits BSPopoverBase
+@inherits ToggleableComponentBase
 
 @if ((IsOpen ?? false))
 {
diff --git a/src/BlazorStrap/Components/Popover/BSPopover.razor.cs b/src/BlazorStrap/Components/Popover/BSPopover.razor.cs
index cb29f414..2b2447e0 100644
--- a/src/BlazorStrap/Components/Popover/BSPopover.razor.cs
+++ b/src/BlazorStrap/Components/Popover/BSPopover.razor.cs
@@ -8,7 +8,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSPopoverBase : ToggleableComponentBase
+    public partial class BSPopover : ToggleableComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         [Inject] public BlazorStrapInterop BlazorStrapInterop { get; set; }
diff --git a/src/BlazorStrap/Components/Popover/BSPopoverBody.razor b/src/BlazorStrap/Components/Popover/BSPopoverBody.razor
index a2d1ffe8..7f3c1932 100644
--- a/src/BlazorStrap/Components/Popover/BSPopoverBody.razor
+++ b/src/BlazorStrap/Components/Popover/BSPopoverBody.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSPopoverBodyBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="div" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Popover/BSPopoverBody.razor.cs b/src/BlazorStrap/Components/Popover/BSPopoverBody.razor.cs
index 1b3c7221..0e52f540 100644
--- a/src/BlazorStrap/Components/Popover/BSPopoverBody.razor.cs
+++ b/src/BlazorStrap/Components/Popover/BSPopoverBody.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSPopoverBodyBase : ComponentBase
+    public partial class BSPopoverBody : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Popover/BSPopoverHeader.razor b/src/BlazorStrap/Components/Popover/BSPopoverHeader.razor
index d65157fb..079b1fb1 100644
--- a/src/BlazorStrap/Components/Popover/BSPopoverHeader.razor
+++ b/src/BlazorStrap/Components/Popover/BSPopoverHeader.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSPopoverHeaderBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="h3" class="@Classname">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Popover/BSPopoverHeader.razor.cs b/src/BlazorStrap/Components/Popover/BSPopoverHeader.razor.cs
index e30211bc..8c2603cb 100644
--- a/src/BlazorStrap/Components/Popover/BSPopoverHeader.razor.cs
+++ b/src/BlazorStrap/Components/Popover/BSPopoverHeader.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSPopoverHeaderBase : ComponentBase
+    public partial class BSPopoverHeader : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Tabs/BSTab.razor b/src/BlazorStrap/Components/Tabs/BSTab.razor
index 44e6d09e..14e709a7 100644
--- a/src/BlazorStrap/Components/Tabs/BSTab.razor
+++ b/src/BlazorStrap/Components/Tabs/BSTab.razor
@@ -1,6 +1,4 @@
 @namespace BlazorStrap
-@inherits BSTabBase
-
 
 <CascadingValue Value="@this">
     @if (Parent.IsList)
diff --git a/src/BlazorStrap/Components/Tabs/BSTab.razor.cs b/src/BlazorStrap/Components/Tabs/BSTab.razor.cs
index 9bbd5dcb..d639f80c 100644
--- a/src/BlazorStrap/Components/Tabs/BSTab.razor.cs
+++ b/src/BlazorStrap/Components/Tabs/BSTab.razor.cs
@@ -7,7 +7,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTabBase : ComponentBase, IDisposable
+    public partial class BSTab : ComponentBase, IDisposable
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         public RenderFragment Content { get; set; }
diff --git a/src/BlazorStrap/Components/Tabs/BSTabContent.razor b/src/BlazorStrap/Components/Tabs/BSTabContent.razor
index 576bf6b6..62ad0617 100644
--- a/src/BlazorStrap/Components/Tabs/BSTabContent.razor
+++ b/src/BlazorStrap/Components/Tabs/BSTabContent.razor
@@ -1,3 +1 @@
-@namespace BlazorStrap
-@inherits BSTabContentBase
-
+@namespace BlazorStrap
\ No newline at end of file
diff --git a/src/BlazorStrap/Components/Tabs/BSTabContent.razor.cs b/src/BlazorStrap/Components/Tabs/BSTabContent.razor.cs
index 9dbfe77f..eae179fd 100644
--- a/src/BlazorStrap/Components/Tabs/BSTabContent.razor.cs
+++ b/src/BlazorStrap/Components/Tabs/BSTabContent.razor.cs
@@ -5,7 +5,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTabContentBase : ComponentBase
+    public partial class BSTabContent : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         public string Classname =>
diff --git a/src/BlazorStrap/Components/Tabs/BSTabEvent.cs b/src/BlazorStrap/Components/Tabs/BSTabEvent.cs
index bc2c7845..0e7882dc 100644
--- a/src/BlazorStrap/Components/Tabs/BSTabEvent.cs
+++ b/src/BlazorStrap/Components/Tabs/BSTabEvent.cs
@@ -2,7 +2,7 @@
 {
     public class BSTabEvent
     {
-        public BSTabBase Activated { get; set; }
-        public BSTabBase Deactivated { get; set; }
+        public BSTab Activated { get; set; }
+        public BSTab Deactivated { get; set; }
     }
 }
diff --git a/src/BlazorStrap/Components/Tabs/BSTabGroup.razor b/src/BlazorStrap/Components/Tabs/BSTabGroup.razor
index d8a1653c..0bafc009 100644
--- a/src/BlazorStrap/Components/Tabs/BSTabGroup.razor
+++ b/src/BlazorStrap/Components/Tabs/BSTabGroup.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSTabGroupBase
 
 <CascadingValue Value="@this">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Tabs/BSTabGroup.razor.cs b/src/BlazorStrap/Components/Tabs/BSTabGroup.razor.cs
index a57ea2e5..571e0067 100644
--- a/src/BlazorStrap/Components/Tabs/BSTabGroup.razor.cs
+++ b/src/BlazorStrap/Components/Tabs/BSTabGroup.razor.cs
@@ -5,16 +5,16 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTabGroupBase : ComponentBase
+    public partial class BSTabGroup : ComponentBase
     {
         internal bool Disposing { get; set; } = false;
         internal bool HasRendered { get; set; } = false;
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
-        public List<BSTabBase> Tabs { get; set; } = new List<BSTabBase>();
+        public List<BSTab> Tabs { get; set; } = new List<BSTab>();
         internal List<EventCallback<BSTabEvent>> EventQue { get; set; } = new List<EventCallback<BSTabEvent>>();
         internal BSTabEvent BSTabEvent { get; set; }
-        private BSTabBase _selected;
-        public BSTabBase Selected
+        private BSTab _selected;
+        public BSTab Selected
         {
             get => _selected;
             set
diff --git a/src/BlazorStrap/Components/Tabs/BSTabLabel.razor b/src/BlazorStrap/Components/Tabs/BSTabLabel.razor
index eb52ddf6..7581354f 100644
--- a/src/BlazorStrap/Components/Tabs/BSTabLabel.razor
+++ b/src/BlazorStrap/Components/Tabs/BSTabLabel.razor
@@ -1,5 +1,4 @@
 @namespace BlazorStrap
-@inherits BSTabLabelBase
 
 <DynamicElement @attributes="@UnknownParameters" TagName="a" class="@Classname" @onclick="Select" href="javascript:void(0);">
     @ChildContent
diff --git a/src/BlazorStrap/Components/Tabs/BSTabLabel.razor.cs b/src/BlazorStrap/Components/Tabs/BSTabLabel.razor.cs
index 7e46b0cb..bd07e6c7 100644
--- a/src/BlazorStrap/Components/Tabs/BSTabLabel.razor.cs
+++ b/src/BlazorStrap/Components/Tabs/BSTabLabel.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTabLabelBase : ComponentBase
+    public partial class BSTabLabel : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         public RenderFragment Content { get; set; }
diff --git a/src/BlazorStrap/Components/Tabs/BSTabList.razor b/src/BlazorStrap/Components/Tabs/BSTabList.razor
index bc57d2dd..a5381cee 100644
--- a/src/BlazorStrap/Components/Tabs/BSTabList.razor
+++ b/src/BlazorStrap/Components/Tabs/BSTabList.razor
@@ -1,13 +1,7 @@
 @namespace BlazorStrap
-@inherits BSTabListBase
 
 <CascadingValue Value="@this">
     <DynamicElement @attributes="@UnknownParameters" TagName="@Tag" class="@Classname">
         @ChildContent
     </DynamicElement>
 </CascadingValue>
-@code {
-
-   
-
-}
\ No newline at end of file
diff --git a/src/BlazorStrap/Components/Tabs/BSTabList.razor.cs b/src/BlazorStrap/Components/Tabs/BSTabList.razor.cs
index 836fcd0d..da2d6bbc 100644
--- a/src/BlazorStrap/Components/Tabs/BSTabList.razor.cs
+++ b/src/BlazorStrap/Components/Tabs/BSTabList.razor.cs
@@ -4,7 +4,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTabListBase : ComponentBase
+    public partial class BSTabList : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         protected string Classname =>
diff --git a/src/BlazorStrap/Components/Tabs/BSTabSelectedContent.razor b/src/BlazorStrap/Components/Tabs/BSTabSelectedContent.razor
index e2d56fc1..c11dc2b3 100644
--- a/src/BlazorStrap/Components/Tabs/BSTabSelectedContent.razor
+++ b/src/BlazorStrap/Components/Tabs/BSTabSelectedContent.razor
@@ -1,5 +1,3 @@
 @namespace BlazorStrap
-@inherits BSTabSelectedContentBase
-
 
 @Group?.Selected?.Content
\ No newline at end of file
diff --git a/src/BlazorStrap/Components/Tabs/BSTabSelectedContent.razor.cs b/src/BlazorStrap/Components/Tabs/BSTabSelectedContent.razor.cs
index 870ec236..64ff852f 100644
--- a/src/BlazorStrap/Components/Tabs/BSTabSelectedContent.razor.cs
+++ b/src/BlazorStrap/Components/Tabs/BSTabSelectedContent.razor.cs
@@ -3,7 +3,7 @@
 
 namespace BlazorStrap
 {
-    public abstract class BSTabSelectedContentBase : ComponentBase
+    public partial class BSTabSelectedContent : ComponentBase
     {
         [Parameter(CaptureUnmatchedValues = true)] public IDictionary<string, object> UnknownParameters { get; set; }
         [CascadingParameter] protected BSTabGroup Group { get; set; }
diff --git a/src/BlazorStrap/wwwroot/blazorStrap.js b/src/BlazorStrap/wwwroot/blazorStrap.js
index 3be86284..90d142fc 100644
--- a/src/BlazorStrap/wwwroot/blazorStrap.js
+++ b/src/BlazorStrap/wwwroot/blazorStrap.js
@@ -27,7 +27,13 @@ window.blazorStrap = {
             if (!document.body.classList.contains("modal-open")) {
                 document.body.classList.add("modal-open");
             }
-            this.paddingRight("17px");
+            var body = document.body,
+                html = document.documentElement;
+            var height = Math.max(body.scrollHeight, body.offsetHeight,
+                html.clientHeight, html.scrollHeight, html.offsetHeight);
+            if (height > window.innerHeight) {
+                this.paddingRight("17px");
+            }
             return id;
         },
         close: function (id) {
@@ -212,11 +218,11 @@ window.blazorStrap = {
         return true;
     },
     setPopper: function () {
-        if (typeof Popper === undefined && script === undefined) {
+        if (typeof Popper === undefined || script === undefined) {
             script = document.createElement('script');
             document.head.insertBefore(script, document.head.lastChild);
+            script.src = "_content/BlazorStrap/popper.min.js";
         }
-        script.src = "_content/BlazorStrap/popper.min.js";
         return true;
     }
 };
diff --git a/src/SampleCore/Pages/Samples/Issue154.razor b/src/SampleCore/Pages/Samples/Issue154.razor
index 361160a5..08af574a 100644
--- a/src/SampleCore/Pages/Samples/Issue154.razor
+++ b/src/SampleCore/Pages/Samples/Issue154.razor
@@ -1,10 +1,10 @@
 @page "/samples/issue154"
-@layout Layout104
-<BSTabGroup >
+
+<BSTabGroup  @ref="tabs">
     <BSTabList>
         @foreach (var tab in _tabList)
         {
-            <BSTab Name="@tab.Label" @key="tab">
+            <BSTab Name="@tab.Label" @key="tab" Id="@tab.Id">
                 <BSTabLabel>@tab.Label <strong @onclick="() => RemoveTab(tab.Id)">X</strong></BSTabLabel>
                 <BSTabContent>@tab.Content</BSTabContent>
             </BSTab>
@@ -14,11 +14,12 @@
     </BSTabGroup>
 
     @code{
-            private class SimpleTab
-            {
-                public string Id { get; set; }
-                public string Label { get; set; }
-                public string Content { get; set; }
+        BSTabGroup tabs;
+        private class SimpleTab
+        {
+            public string Id { get; set; }
+            public string Label { get; set; }
+            public string Content { get; set; }
 
             public SimpleTab(string label, string content)
             {
@@ -42,7 +43,26 @@
             var tab = this._tabList.FirstOrDefault(x => x.Id == tabId);
             if (tab != null)
             {
+
+                if(tab.Id == tabs.Selected.Id)
+                {
+                    string nextid = new Guid().ToString();
+                    if (_tabList.IndexOf(tab) > 0)
+                    {
+                        nextid = _tabList[_tabList.IndexOf(tab) - 1].Id;
+                    }
+                    else if(_tabList.Count > 1)
+                    {
+                        nextid = _tabList[_tabList.IndexOf(tab) + 1].Id;
+                    }
+                    if (nextid != new Guid().ToString())
+                        tabs.SelectTabById(nextid);
+
+                }
+
                 this._tabList.Remove(tab);
+
+
             }
             StateHasChanged();
         }
diff --git a/src/SampleCore/Pages/Samples/Issue278Types/Customer.cs b/src/SampleCore/Pages/Samples/Issue278Types/Customer.cs
index ef42b44d..9f2addeb 100644
--- a/src/SampleCore/Pages/Samples/Issue278Types/Customer.cs
+++ b/src/SampleCore/Pages/Samples/Issue278Types/Customer.cs
@@ -9,6 +9,7 @@ public class Customer
         public bool? Checked { get; set; } 
         public string FirstName { get; set; }
         public string LastName { get; set; }
+
         public Address Address { get; } = new Address();
         public List<PaymentMethod> PaymentMethods { get; } = new List<PaymentMethod>();
     }
diff --git a/src/SampleCore/Pages/Samples/Issue356.razor b/src/SampleCore/Pages/Samples/Issue356.razor
new file mode 100644
index 00000000..69cb98e1
--- /dev/null
+++ b/src/SampleCore/Pages/Samples/Issue356.razor
@@ -0,0 +1,8 @@
+@page "/Samples/Issue356"
+<BSBasicInput InputType="InputType.Number" @bind-Value="@amount" step="0.01"  />
+
+
+@code
+{
+    string amount = "0.10";
+}
\ No newline at end of file
diff --git a/src/SampleCore/Pages/Samples/Issue371.razor b/src/SampleCore/Pages/Samples/Issue371.razor
new file mode 100644
index 00000000..901f5932
--- /dev/null
+++ b/src/SampleCore/Pages/Samples/Issue371.razor
@@ -0,0 +1,28 @@
+@page "/samples/issue371"
+@using System.ComponentModel.DataAnnotations;
+<BSForm Model="Model" ValidateOnInit="true">
+    <DataAnnotationsValidator/>
+    <BSFormGroup>
+        <BSLabel For="EmailAddress">Email Address</BSLabel>
+        <BSInput InputType="InputType.Email" id="EmailAddress" @bind-Value="@Model.Email" ValidateOnChange="true"/>
+        <BSFormFeedback For="@(() => Model.Email)" ValidMessage="Sweet"></BSFormFeedback>
+    </BSFormGroup>
+</BSForm>
+
+
+@code
+{
+    FormsModel Model = new FormsModel();
+    public class FormsModel
+    {
+
+        public string Valid { get; set; }
+        public DateTime Date { get; set; }
+        [Required(AllowEmptyStrings = false, ErrorMessage = "Oh noes! that name is already taken")]
+        public string InValid { get; set; }
+        public string Blank { get; set; }
+        [Required]
+        [EmailAddress]
+        public string Email { get; set; } = "email@example.com";
+    }
+}
\ No newline at end of file
diff --git a/src/SampleCore/Pages/Samples/Issue403.razor b/src/SampleCore/Pages/Samples/Issue403.razor
new file mode 100644
index 00000000..981c1773
--- /dev/null
+++ b/src/SampleCore/Pages/Samples/Issue403.razor
@@ -0,0 +1,16 @@
+@page "/samples/issue403"
+<BSButton Color="Color.Primary" @onclick="@(() => LiveDemo.Show())">Launch demo modal</BSButton>
+<BSModal @ref="LiveDemo">
+    <BSModalHeader OnClick="@(() => LiveDemo.Hide())">Modal title</BSModalHeader>
+    <BSModalHeader HideCloseButton="true">Modal title2</BSModalHeader>
+    <BSModalHeader HideCloseButton="true">Modal title3</BSModalHeader>
+    <BSModalBody><p>Modal body text goes here.</p></BSModalBody>
+    <BSModalFooter>
+        <BSButton Color="Color.Secondary" @onclick="@(() => LiveDemo.Hide())">Close</BSButton>
+        <BSButton Color="Color.Primary" @onclick="@(() => LiveDemo.Hide())">Save Changes</BSButton>
+    </BSModalFooter>
+</BSModal>
+
+@code {
+    BSModal LiveDemo { get; set; }
+}
\ No newline at end of file
diff --git a/src/SampleCore/Pages/Samples/Issue412.razor b/src/SampleCore/Pages/Samples/Issue412.razor
new file mode 100644
index 00000000..77094d36
--- /dev/null
+++ b/src/SampleCore/Pages/Samples/Issue412.razor
@@ -0,0 +1,16 @@
+@page "/samples/issue412"
+<div class="docs-example">
+    <BSButton Color="Color.Primary" @onclick="@(() => LiveDemo.Show())">Launch demo modal</BSButton>
+    <BSModal @ref="LiveDemo">
+        <BSModalHeader OnClick="@(() => LiveDemo.Hide())">Modal title</BSModalHeader>
+        <BSModalBody><p>Modal body text goes here.</p></BSModalBody>
+        <BSModalFooter>
+            <BSButton Color="Color.Secondary" @onclick="@(() => LiveDemo.Hide())">Close</BSButton>
+            <BSButton Color="Color.Primary" @onclick="@(() => LiveDemo.Hide())">Save Changes</BSButton>
+        </BSModalFooter>
+    </BSModal>
+</div>
+
+@code {
+    BSModal LiveDemo { get; set; }
+}
\ No newline at end of file
diff --git a/src/SampleCore/Shared/MainLayout.razor b/src/SampleCore/Shared/MainLayout.razor
index f987848f..cca6674d 100644
--- a/src/SampleCore/Shared/MainLayout.razor
+++ b/src/SampleCore/Shared/MainLayout.razor
@@ -30,6 +30,7 @@
     {
         if (isServerSide && firstrun)
         {
+            System.Diagnostics.Debug.WriteLine("test");
             await BootstrapCSS.SetBootstrapCSS("4.5.0");
         }
     }