diff --git a/mailchimp_widget.php b/mailchimp_widget.php
index 0e490dbf..965509b3 100644
--- a/mailchimp_widget.php
+++ b/mailchimp_widget.php
@@ -23,7 +23,11 @@ function mailchimp_sf_signup_form( $args = array() ) {
 
 	// See if we have valid Merge Vars
 	if ( ! is_array( $mv ) ) {
-		echo wp_kses_post( $before_widget );
+		if ( ! empty( $before_widget ) ) {
+			echo wp_kses_post( $before_widget );
+		} else {
+			echo '<div class="mc_container">';
+		}
 		?>
 		<div class="mc_error_msg">
 			<?php
@@ -39,12 +43,21 @@ function mailchimp_sf_signup_form( $args = array() ) {
 			?>
 		</div>
 		<?php
-		echo wp_kses_post( $after_widget );
+		if ( ! empty( $after_widget ) ) {
+			echo wp_kses_post( $after_widget );
+		}
+
+		if ( empty( $before_widget ) ) {
+			echo '</div>';
+		}
+
 		return;
 	}
 
 	if ( ! empty( $before_widget ) ) {
 		echo wp_kses_post( $before_widget );
+	} else {
+		echo '<div class="mc_container">';
 	}
 
 	$header = get_option( 'mc_header_content' );
@@ -72,7 +85,7 @@ function mailchimp_sf_signup_form( $args = array() ) {
 	}
 	#mc_subheader {
 		line-height: 1.25em;
-		margin-bottom: 18px;
+		margin: 18px 0;
 	}
 	.mc_merge_var {
 		margin-bottom: 1.0em;
@@ -275,6 +288,10 @@ function mailchimp_sf_signup_form( $args = array() ) {
 	if ( ! empty( $after_widget ) ) {
 		echo wp_kses_post( $after_widget );
 	}
+
+	if ( empty( $before_widget ) ) {
+		echo '</div>';
+	}
 }
 
 /**