diff --git a/src/Connected.Components/Components/Container/Container.razor b/src/Connected.Components/Components/Container/Container.razor
index 8088c1d..16ee03e 100644
--- a/src/Connected.Components/Components/Container/Container.razor
+++ b/src/Connected.Components/Components/Container/Container.razor
@@ -2,6 +2,6 @@
 
 @inherits UIComponent
 
-<div @attributes="CustomAttributes" class="@Classname">
+<div @attributes="CustomAttributes" class="@CompiledClassList.Build()" style="@CompiledStyleList.Build()">
     @ChildContent
 </div>
\ No newline at end of file
diff --git a/src/Connected.Components/Components/Container/Container.razor.cs b/src/Connected.Components/Components/Container/Container.razor.cs
index 4427065..f1746b3 100644
--- a/src/Connected.Components/Components/Container/Container.razor.cs
+++ b/src/Connected.Components/Components/Container/Container.razor.cs
@@ -1,36 +1,54 @@
-using Connected.Annotations;
-using Connected.Extensions;
-using Connected.Utilities;
+using Connected.Utilities;
 using Microsoft.AspNetCore.Components;
 
 namespace Connected.Components;
 public partial class Container : UIComponent
 {
-	protected string Classname =>
-	new CssBuilder("container")
-	  .AddClass($"container-fixed", Fixed)
-	  .AddClass($"container-maxwidth-{MaxWidth.ToDescription()}", !Fixed)
-	  .AddClass(AdditionalClassList)
-	.Build();
+
+	#region Event callbacks
+	#endregion
+
+	#region Content placeholders
 
 	/// <summary>
-	/// Set the max-width to match the min-width of the current breakpoint. This is useful if you'd prefer to design for a fixed set of sizes instead of trying to accommodate a fully fluid viewport. It's fluid by default.
+	/// Child content of component.
 	/// </summary>
 	[Parameter]
-	[Category(CategoryTypes.Container.Behavior)]
-	public bool Fixed { get; set; } = false;
+	public RenderFragment ChildContent { get; set; }
+
+	#endregion
+
+	#region Styling properties
+	private CssBuilder CompiledClassList
+	{
+		get
+		{
+			return new CssBuilder("container")
+			  .AddClass(ClassList);
+		}
+	}
+
+	protected StyleBuilder CompiledStyleList
+	{
+		get
+		{
+			return new StyleBuilder()
+				.AddStyle(StyleList);
+
+		}
+	}
 
 	/// <summary>
-	/// Determine the max-width of the container. The container width grows with the size of the screen. Set to false to disable maxWidth.
+	/// A space separated list of class names, added on top of the default class list.
 	/// </summary>
 	[Parameter]
-	[Category(CategoryTypes.Container.Behavior)]
-	public MaxWidth MaxWidth { get; set; } = MaxWidth.Large;
+	public string? ClassList { get; set; }
 
 	/// <summary>
-	/// Child content of component.
+	/// A space separated list of class names, added on top of the default class list.
 	/// </summary>
 	[Parameter]
-	[Category(CategoryTypes.Container.Behavior)]
-	public RenderFragment ChildContent { get; set; }
+	public string? StyleList { get; set; }
+
+	#endregion
 }
diff --git a/src/Connected.Components/Components/Drawer/Drawer.razor b/src/Connected.Components/Components/Drawer/Drawer.razor
index 19df66e..967cfa2 100644
--- a/src/Connected.Components/Components/Drawer/Drawer.razor
+++ b/src/Connected.Components/Components/Drawer/Drawer.razor
@@ -1,7 +1,6 @@
 @namespace Connected.Components
 @inherits UIComponent
 
-<p>@_screenBreakpoint.ToString()</p>
 @if (_screenBreakpoint.ToString().ToLower() != "xs")
 {
     <aside @onmouseenter="OnMouseEnter" @onmouseleave="OnMouseLeave" @attributes="CustomAttributes" class="@CompiledClassList.Build()" style="@CompiledStyleList.Build()">
diff --git a/src/Connected.Components/Components/Drawer/Drawer.razor.cs b/src/Connected.Components/Components/Drawer/Drawer.razor.cs
index 713d52c..031b508 100644
--- a/src/Connected.Components/Components/Drawer/Drawer.razor.cs
+++ b/src/Connected.Components/Components/Drawer/Drawer.razor.cs
@@ -255,12 +255,12 @@ public partial class Drawer : UIComponent, IDisposable, INavigationEventReceiver
 	{
 		get
 		{
-			return new CssBuilder("drawer-overlay mud-overlay-drawer")
-	  .AddClass($"drawer-pos-{GetPosition()}")
-	  .AddClass($"drawer-overlay--open", Open)
-	  .AddClass($"drawer-overlay-{Variant.ToDescription()}")
-	  .AddClass($"drawer-overlay-{Breakpoint.ToDescription()}")
-	  .AddClass($"drawer-overlay--initial", _initial);
+			return new CssBuilder("drawer-overlay")
+			  .AddClass($"drawer-pos-{GetPosition()}")
+			  .AddClass($"drawer-overlay--open", Open)
+			  .AddClass($"drawer-overlay-{Variant.ToDescription()}")
+			  .AddClass($"drawer-overlay-{Breakpoint.ToDescription()}")
+			  .AddClass($"drawer-overlay--initial", _initial);
 		}
 	}