diff --git a/public/src/forum/admin/themes.js b/public/src/forum/admin/themes.js
index 37180be94b..f80159fc00 100644
--- a/public/src/forum/admin/themes.js
+++ b/public/src/forum/admin/themes.js
@@ -135,18 +135,34 @@ define(['forum/admin/settings'], function(Settings) {
 	}
 
 	Themes.prepareWidgets = function() {
-		$('#widgets .panel').draggable({
+		$('#widgets .available-widgets .panel').draggable({
 			helper: function(e) {
 				return $(e.target).parents('.panel').clone().addClass('block').width($(e.target.parentNode).width());
 			},
 			connectToSortable: ".widget-area"
 		});
 
+		$('#widgets .available-containers .containers > [data-container]').draggable({
+			helper: function(e) {
+				var target = $(e.target);
+				target = target.attr('data-container') ? target : target.parents('[data-container]');
+
+				return target.clone().addClass('block').width(target.width()).css('opacity', '0.5');
+			}
+		});
+
 		function appendToggle(el) {
 			if (!el.hasClass('block')) {
 				el.addClass('block')
+					.droppable({
+						drop: function(event, ui) {
+							$(this).find('.panel-heading small').html(ui.draggable.attr('data-container'));
+						},
+						hoverClass: "panel-info"
+					})
 					.children('.panel-heading')
-						.append('<div class="pull-right pointer"><span class="delete-widget"><i class="fa fa-times-circle"></i></span>&nbsp;<span class="toggle-widget"><i class="fa fa-chevron-down"></i></span></div>');
+						.append('<div class="pull-right pointer"><span class="delete-widget"><i class="fa fa-times-circle"></i></span>&nbsp;<span class="toggle-widget"><i class="fa fa-chevron-down"></i></span></div>')
+						.children('small').html('');
 			}
 		}
 
diff --git a/public/templates/admin/themes.tpl b/public/templates/admin/themes.tpl
index 861dbaee37..22d423c844 100644
--- a/public/templates/admin/themes.tpl
+++ b/public/templates/admin/themes.tpl
@@ -54,25 +54,7 @@
 			<h3>Widgets</h3>
 
 			<div class="row">
-				<div class="col-xs-6 available-widgets">
-					<h4>Available Widgets</h4>
-					<div class="well">
-						<!-- BEGIN widgets -->
-						<div data-widget="{widgets.widget}" class="panel panel-default pointer">
-							<div class="panel-heading">
-								<strong>{widgets.name}</strong> <small>{widgets.description}</small>
-							</div>
-							<div class="panel-body hidden">
-								<form>
-									{widgets.content}
-								</form>
-							</div>
-						</div>
-						<!-- END widgets -->
-					</div>
-				</div>
-
-				<div class="col-xs-6">
+				<div class="col-xs-6 pull-right">
 					<!-- BEGIN areas -->
 					<div class="area">
 						<h4>{areas.name} <small>{areas.template} / {areas.location}</small> <button data-template="{areas.template}" data-location="{areas.location}" class="btn btn-success btn-xs pull-right">Save</button></h4>
@@ -82,6 +64,45 @@
 					</div>
 					<!-- END areas -->
 				</div>
+				<div class="col-xs-6 pull-left">
+					<div class="available-widgets">
+						<h4>Available Widgets</h4>
+						<div>
+							<!-- BEGIN widgets -->
+							<div data-widget="{widgets.widget}" class="panel panel-default pointer">
+								<div class="panel-heading">
+									<strong>{widgets.name}</strong> <small>{widgets.description}</small>
+								</div>
+								<div class="panel-body hidden">
+									<form>
+										{widgets.content}
+									</form>
+								</div>
+							</div>
+							<!-- END widgets -->
+						</div>
+					</div>
+
+					<div class="available-containers">
+						<h4>Available Containers</h4>
+						<div class="containers">
+							<div class="pointer" style="padding: 20px; border: 1px dotted #dedede; margin-bottom: 20px;" data-container=" ">
+								None
+							</div>
+							<div class="well pointer" data-container="well">
+								Well
+							</div>
+							<div class="panel panel-default pointer" data-container="panel">
+								<div class="panel-heading">
+									Panel Header
+								</div>
+								<div class="panel-body">
+									Panel Body
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 			</div>
 		</div>
 	</div>