diff --git a/inc/renderer.php b/inc/renderer.php
index 34211b786..02177686f 100644
--- a/inc/renderer.php
+++ b/inc/renderer.php
@@ -109,7 +109,7 @@ public function generate_css( $post_id, $panels_data = false, $layout_data = fal
 
 			// If the CSS Container Breaker is enabled, and this row is using it,
 			// we need to remove the cell widths on mobile.
-			$css_container_cutoff = $this->container['css_override'] && isset( $row['style']['row_stretch'] ) && $row['style']['row_stretch'] == 'full' ? ":$panels_mobile_width" : 1920;
+			$css_container_cutoff = $this->container['css_override'] && isset( $row['style']['row_stretch'] ) && $row['style']['row_stretch'] == 'full' ? ':' . ( $panels_mobile_width + 1 ) : 1920;
 
 			if (
 				$this->container['css_override'] &&
@@ -118,7 +118,8 @@ public function generate_css( $post_id, $panels_data = false, $layout_data = fal
 				! empty( $row['style']['row_stretch'] ) &&
 				 (
 				 	$row['style']['row_stretch'] == 'full' ||
-				 	$row['style']['row_stretch'] == 'stretch'
+				 	$row['style']['row_stretch'] == 'full-stretched' ||
+				 	$row['style']['row_stretch'] == 'full-stretched-padded'
 				 )
 			) {
 				$this->container['full_width'] = true;
diff --git a/readme.txt b/readme.txt
index 65831970c..1f17e3141 100644
--- a/readme.txt
+++ b/readme.txt
@@ -107,6 +107,10 @@ SiteOrigin Premium includes access to our professional email support service, pe
 
 == Changelog ==
 
+= 2.16.4 - 19 February 2022 =
+* Full-Width Containers Using CSS: Restored normal functionality when Standard or Full-Width rows not present.
+* Full-Width Containers Using CSS: Resolved a collapse issue when the browser resolution equals the collapse value.
+
 = 2.16.3 - 14 February 2022 =
 * Fixed Background Images: Change to `scroll` on mobile devices. Resolves iOS bug.
 
diff --git a/widgets/widgets/call-to-action/call-to-action.php b/widgets/widgets/call-to-action/call-to-action.php
index 310406ae4..57cab97db 100644
--- a/widgets/widgets/call-to-action/call-to-action.php
+++ b/widgets/widgets/call-to-action/call-to-action.php
@@ -1,39 +1,39 @@
 <?php
 
-class SiteOrigin_Panels_Widget_Call_To_Action extends SiteOrigin_Panels_Widget  {
+class SiteOrigin_Panels_Widget_Call_To_Action extends SiteOrigin_Panels_Widget {
 	function __construct() {
 		parent::__construct(
-			__('Call To Action (PB)', 'siteorigin-panels'),
+			__( 'Call To Action (PB)', 'siteorigin-panels' ),
 			array(
-				'description' => __('A Call to Action block', 'siteorigin-panels'),
+				'description' => __( 'A Call to Action block', 'siteorigin-panels' ),
 				'default_style' => 'simple',
 			),
 			array(),
 			array(
 				'title' => array(
 					'type' => 'text',
-					'label' => __('Title', 'siteorigin-panels'),
+					'label' => __( 'Title', 'siteorigin-panels' ),
 				),
 				'subtitle' => array(
 					'type' => 'text',
-					'label' => __('Sub Title', 'siteorigin-panels'),
+					'label' => __( 'Sub Title', 'siteorigin-panels' ),
 				),
 				'button_text' => array(
 					'type' => 'text',
-					'label' => __('Button Text', 'siteorigin-panels'),
+					'label' => __( 'Button Text', 'siteorigin-panels' ),
 				),
 				'button_url' => array(
 					'type' => 'text',
-					'label' => __('Button URL', 'siteorigin-panels'),
+					'label' => __( 'Button URL', 'siteorigin-panels' ),
 				),
 				'button_new_window' => array(
 					'type' => 'checkbox',
-					'label' => __('Open In New Window', 'siteorigin-panels'),
+					'label' => __( 'Open In New Window', 'siteorigin-panels' ),
 				),
 			)
 		);
 
-		// We need the button style
-		$this->add_sub_widget('button', __('Button', 'siteorigin-panels'), 'SiteOrigin_Panels_Widget_Button');
+		// We need the button style.
+		$this->add_sub_widget( 'button', __( 'Button', 'siteorigin-panels' ), 'SiteOrigin_Panels_Widget_Button') ;
 	}
 }
\ No newline at end of file