diff --git a/wp-content/themes/pub/wporg-learn-2024/assets/icon-check.svg b/wp-content/themes/pub/wporg-learn-2024/assets/icon-check.svg
new file mode 100644
index 000000000..c70f8a3e3
--- /dev/null
+++ b/wp-content/themes/pub/wporg-learn-2024/assets/icon-check.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.9295 7.97898L10.7313 17.6598L6.21499 14.3017L7.11001 13.098L10.4226 15.5611L16.7258 7.08395L17.9295 7.97898Z" fill="#008A20"/>
+</svg>
diff --git a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php
index 59ffb7673..3d78e5df6 100644
--- a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php
+++ b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-actions.php
@@ -17,43 +17,42 @@
 <!-- wp:sensei-lms/lesson-actions {"toggledBlocks":{"sensei-lms/button-reset-lesson":false}} -->
 <div class="wp-block-sensei-lms-lesson-actions">
 	<div class="sensei-buttons-container">
-
-		<!-- wp:sensei-lms/button-view-quiz {"inContainer":true} -->
-		<div class="wp-block-sensei-lms-button-view-quiz is-style-default sensei-buttons-container__button-block wp-block-sensei-lms-button-view-quiz__wrapper">
-			<div class="wp-block-sensei-lms-button-view-quiz is-style-default wp-block-sensei-button wp-block-button has-text-align-left">
-				<button class="wp-block-button__link"><?php esc_html_e( 'Take quiz', 'sensei-lms' ); ?></button>
-			</div>
-		</div>
-		<!-- /wp:sensei-lms/button-view-quiz -->
-
-		<!-- wp:sensei-lms/button-complete-lesson {"inContainer":true,"className":"is-style-outline"} -->
-		<div class="wp-block-sensei-lms-button-complete-lesson is-style-outline sensei-buttons-container__button-block wp-block-sensei-lms-button-complete-lesson__wrapper">
-			<div class="wp-block-sensei-lms-button-complete-lesson is-style-outline wp-block-sensei-button wp-block-button has-text-align-left">
-				<button class="wp-block-button__link sensei-stop-double-submission"><?php esc_html_e( 'Complete lesson', 'sensei-lms' ); ?></button>
-			</div>
-		</div>
-		<!-- /wp:sensei-lms/button-complete-lesson -->
-
-		<?php if ( $is_completed && ( $prev_url || $next_url ) ) : ?>
+		<?php if ( $prev_url || $next_url ) : ?>
 			<!-- wp:buttons {"className":"sensei-lesson-actions-nav"} -->
 			<div class="wp-block-buttons sensei-lesson-actions-nav">
 				<?php if ( $prev_url ) : ?>
-					<!-- wp:button {"className":"is-style-outline"} -->
-					<div class="wp-block-button is-style-outline has-text-align-left">
-						<a class="wp-block-button__link wp-element-button" href="<?php echo esc_attr( $prev_url ); ?>"><?php esc_html_e( 'Previous Lesson', 'wporg-learn' ); ?></a>
+					<!-- wp:button {"className":"has-text-align-center is-style-outline","fontSize":"normal","fontFamily":"inter"} -->
+					<div class="wp-block-button has-custom-font-size has-text-align-center is-style-outline has-inter-font-family has-normal-font-size">
+						<a class="wp-block-button__link wp-element-button" style="font-weight:600;line-height:1" href="<?php echo esc_attr( $prev_url ); ?>"><?php esc_html_e( 'Previous Lesson', 'wporg-learn' ); ?></a>
 					</div>
 					<!-- /wp:button -->
 				<?php endif; ?>
 				<?php if ( $next_url ) : ?>
-					<!-- wp:button {"className":"is-style-fill"} -->
-					<div class="wp-block-button is-style-fill has-text-align-left">
-						<a class="wp-block-button__link wp-element-button" href="<?php echo esc_attr( $next_url ); ?>"><?php esc_html_e( 'Next Lesson', 'wporg-learn' ); ?></a>
+					<!-- wp:button {"className":"has-text-align-center is-style-outline","fontSize":"normal","fontFamily":"inter"} -->
+					<div class="wp-block-button has-custom-font-size has-text-align-center is-style-outline has-inter-font-family has-normal-font-size">
+						<a class="wp-block-button__link wp-element-button" style="font-weight:600;line-height:1" href="<?php echo esc_attr( $next_url ); ?>"><?php esc_html_e( 'Next Lesson', 'wporg-learn' ); ?></a>
 					</div>
 					<!-- /wp:button -->
 				<?php endif; ?>
 			</div>
 			<!-- /wp:buttons -->
 		<?php endif; ?>
+
+		<!-- wp:sensei-lms/button-view-quiz {"inContainer":true} -->
+		<div class="wp-block-sensei-lms-button-view-quiz sensei-buttons-container__button-block wp-block-sensei-lms-button-view-quiz__wrapper">
+			<div class="wp-block-sensei-lms-button-view-quiz wp-block-sensei-button wp-block-button has-text-align-center has-inter-font-family has-normal-font-size">
+				<button class="wp-block-button__link"><?php esc_html_e( 'Take quiz to complete lesson', 'wporg-learn' ); ?></button>
+			</div>
+		</div>
+		<!-- /wp:sensei-lms/button-view-quiz -->
+
+		<!-- wp:sensei-lms/button-complete-lesson {"inContainer":true} -->
+		<div class="wp-block-sensei-lms-button-complete-lesson sensei-buttons-container__button-block wp-block-sensei-lms-button-complete-lesson__wrapper">
+			<div class="wp-block-sensei-lms-button-complete-lesson wp-block-sensei-button wp-block-button has-text-align-center has-inter-font-family has-normal-font-size">
+				<button class="wp-block-button__link sensei-stop-double-submission"><?php esc_html_e( 'Complete lesson', 'sensei-lms' ); ?></button>
+			</div>
+		</div>
+		<!-- /wp:sensei-lms/button-complete-lesson -->
 	</div>
 </div>
 <!-- /wp:sensei-lms/lesson-actions -->
diff --git a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-columns.php b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-columns.php
index 74e2fa472..e76576462 100644
--- a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-columns.php
+++ b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-columns.php
@@ -5,24 +5,20 @@
  * Inserter: no
  */
 
+$lesson_id = Sensei_Utils::get_current_lesson();
+$module = Sensei()->modules->get_lesson_module( $lesson_id );
+$is_completed = Sensei_Utils::user_completed_lesson( $lesson_id );
+
 ?>
 
 <!-- wp:sensei-lms/ui {"elementClass":"sensei-course-theme__columns","className":"sensei-version\u002d\u002d4-16-2"} -->
 <div class="wp-block-sensei-lms-ui sensei-course-theme__columns sensei-version--4-16-2">
 
-	<!-- wp:sensei-lms/ui {"elementClass":"sensei-course-theme__sidebar","className":"","style"={"spacing":{"margin":{"top":"var:preset|spacing|50"},"padding":{"top":"var:preset|spacing|20","right":"var:preset|spacing|30","bottom":"var:preset|spacing|50","left":"var:preset|spacing|edge-space"}}}} -->
-	<div class="wp-block-sensei-lms-ui sensei-course-theme__frame sensei-course-theme__sidebar" style="margin-top:var(--wp--preset--spacing--50);padding-top:var(--wp--preset--spacing--20);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--edge-space)">
+	<!-- wp:sensei-lms/ui {"elementClass":"sensei-course-theme__sidebar","style"={"spacing":{"padding":{"top":"var:preset|spacing|50","right":"var:preset|spacing|30","bottom":"var:preset|spacing|50","left":"var:preset|spacing|50"}}}} -->
+	<div class="wp-block-sensei-lms-ui sensei-course-theme__frame sensei-course-theme__sidebar" style="padding-top:var(--wp--preset--spacing--50);padding-right:var(--wp--preset--spacing--30);padding-bottom:var(--wp--preset--spacing--50);padding-left:var(--wp--preset--spacing--50)">
 
 		<!-- wp:sensei-lms/course-navigation /-->
 
-		<!-- wp:group {"style":{"border":{"top":{"color":"var:preset|color|light-grey-1","width":"1px"}},"spacing":{"padding":{"top":"var:preset|spacing|20"}}},"layout":{"type":"constrained"}} -->
-		<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--light-grey-1);border-top-width:1px;padding-top:var(--wp--preset--spacing--20)">
-
-			<!-- wp:pattern {"slug":"wporg-learn-2024/content-feedback"} /-->
-
-		</div>
-		<!-- /wp:group -->
-
 	</div>
 	<!-- /wp:sensei-lms/ui -->
 
@@ -31,25 +27,57 @@
 
 		<!-- wp:sensei-lms/course-theme-lesson-module /-->
 
-		<!-- wp:post-title {"level":1,"fontSize":"heading-1"} /-->
+		<?php if ( $is_completed ) : ?>
+			<!-- wp:wporg/notice {"style":{"spacing":{"margin":{"top":"var:preset|spacing|20"}}}} -->
+			<div class="wp-block-wporg-notice is-tip-notice" style="margin-top:var(--wp--preset--spacing--20)">
+				<div class="wp-block-wporg-notice__icon"></div>
+				<div class="wp-block-wporg-notice__content">
+					<p><?php esc_html_e( 'You already completed this lesson', 'wporg-learn' ); ?></p>
+				</div>
+			</div>
+			<!-- /wp:wporg/notice -->
+		<?php endif; ?>
+
+		<?php if ( $module ) : ?>
+			<!-- wp:post-title {"level":1,"style":{"spacing":{"margin":{"top":"var:preset|spacing|50"}},"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontSize":"heading-3","fontFamily":"inter"} /-->
+		<?php else : ?>
+			<!-- wp:post-title {"level":1,"fontSize":"heading-3","fontFamily":"inter","style":{"spacing":{"margin":{"top":"0"}},"typography":{"lineHeight":"1","fontStyle":"normal","fontWeight":"600"}}} /-->	 
+		<?php endif; ?> 
+
+		<!-- wp:post-content {"layout":{"type":"constrained","justifyContent":"left"}} /-->
 
 		<!-- wp:sensei-lms/course-theme-notices /-->
 
-		<!-- wp:post-content {"layout":{"inherit":true}} /-->
+		<?php if ( is_user_logged_in() ) : ?>
+			<!-- wp:group {"style":{"spacing":{"margin":{"top":"0","bottom":"var(--wp--preset--spacing--50)"}}},"layout":{"type":"constrained"},"className":"sensei-lesson-footer"} -->
+			<div class="wp-block-group sensei-lesson-footer" style="margin-top:0;margin-bottom:var(--wp--preset--spacing--50)">
+				<!-- wp:sensei-lms/page-actions {"style":{"spacing":{"blockGap":"43px"}}} /-->
+
+				<!-- wp:group {"style":{"spacing":{"margin":{"top":"0"}}}} -->
+				<div class="wp-block-group" style="margin-top:0">
+
+					<!-- wp:pattern {"slug":"wporg-learn-2024/sensei-lesson-actions"} /-->
+
+				</div>
+				<!-- /wp:group -->
+			</div>
+			<!-- /wp:group -->
+		<?php endif; ?>
 
-		<!-- wp:group {"style":{"spacing":{"margin":{"top":"40px"}}},"layout":{"type":"constrained"},"className":"sensei-lesson-footer"} -->
-		<div class="wp-block-group sensei-lesson-footer" style="margin-top:40px">
-			<!-- wp:sensei-lms/page-actions {"style":{"spacing":{"blockGap":"43px"}}} /-->
+		<!-- wp:group {"align":"full","style":{"border":{"top":{"color":"var:preset|color|light-grey-1","width":"1px"},"right":{},"bottom":{},"left":{}},"spacing":{"margin":{"top":"0"}},"layout":{"type":"constrained"}} -->
+		<div class="wp-block-group alignfull" style="margin-top:0;border-top-color:var(--wp--preset--color--light-grey-1);border-top-width:1px">
 
-			<!-- wp:group {"style":{"spacing":{"margin":{"top":"20px"}}}} -->
-			<div class="wp-block-group" style="margin-top:20px">
+			<!-- wp:group {"layout":{"type":"constrained"},"spacing":{"margin":{"top":"var(--wp--preset--spacing--30)"}}} -->
+			<div class="wp-block-group alignwide" style="margin-top:var(--wp--preset--spacing--30)">
 
-				<!-- wp:pattern {"slug":"wporg-learn-2024/sensei-lesson-actions"} /-->
+				<!-- wp:pattern {"slug":"wporg-learn-2024/content-feedback"} /-->
 
 			</div>
 			<!-- /wp:group -->
+
 		</div>
 		<!-- /wp:group -->
+
 	</div>
 	<!-- /wp:sensei-lms/ui -->
 </div>
diff --git a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-header.php b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-header.php
index e3c9e0b03..720ff2e0b 100644
--- a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-header.php
+++ b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-header.php
@@ -12,8 +12,8 @@
 <!-- wp:sensei-lms/ui {"elementClass":"sensei-course-theme__header","className":"sensei-version\u002d\u002d4-16-2"} -->
 <div class="wp-block-sensei-lms-ui sensei-course-theme__frame sensei-version--4-16-2 sensei-course-theme__header">
 	
-	<!-- wp:group {"style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space","top":"0px","bottom":"0px"}}},"backgroundColor":"white","className":"sensei-course-theme-header-content","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-	<div class="wp-block-group sensei-course-theme-header-content has-white-background-color has-background" style="padding-top:0px;padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:0px;padding-left:var(--wp--preset--spacing--edge-space)">
+	<!-- wp:group {"style":{"spacing":{"padding":{"left":"var:preset|spacing|30","right":"var:preset|spacing|30","top":"0px","bottom":"0px"}}},"backgroundColor":"white","className":"sensei-course-theme-header-content","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+	<div class="wp-block-group sensei-course-theme-header-content has-white-background-color has-background" style="padding-top:0px;padding-right:var(--wp--preset--spacing--30);padding-bottom:0px;padding-left:var(--wp--preset--spacing--30)">
 
 		<!-- wp:wporg/site-breadcrumbs {"fontSize":"small","style":{"spacing":{"padding":{"top":"18px","bottom":"18px"}}}} /-->
 
diff --git a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-standalone.php b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-standalone.php
index 3c5f96ad3..f4cba0493 100644
--- a/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-standalone.php
+++ b/wp-content/themes/pub/wporg-learn-2024/patterns/sensei-lesson-standalone.php
@@ -10,8 +10,8 @@
 <!-- wp:sensei-lms/ui {"elementClass":"sensei-course-theme__header","className":"sensei-version\u002d\u002d4-16-2 sensei-course-theme__header--standalone"} -->
 <div class="wp-block-sensei-lms-ui sensei-course-theme__frame sensei-version--4-16-2 sensei-course-theme__header sensei-course-theme__header--standalone">
 	
-	<!-- wp:group {"style":{"spacing":{"padding":{"left":"var:preset|spacing|edge-space","right":"var:preset|spacing|edge-space","top":"0px","bottom":"0px"}}},"backgroundColor":"white","className":"sensei-course-theme-header-content","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
-	<div class="wp-block-group sensei-course-theme-header-content has-white-background-color has-background" style="padding-top:0px;padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:0px;padding-left:var(--wp--preset--spacing--edge-space)">
+	<!-- wp:group {"style":{"spacing":{"padding":{"left":"var:preset|spacing|30","right":"var:preset|spacing|30","top":"0px","bottom":"0px"}}},"backgroundColor":"white","className":"sensei-course-theme-header-content","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
+	<div class="wp-block-group sensei-course-theme-header-content has-white-background-color has-background" style="padding-top:0px;padding-right:var(--wp--preset--spacing--30);padding-bottom:0px;padding-left:var(--wp--preset--spacing--30)">
 
 		<!-- wp:wporg/site-breadcrumbs {"fontSize":"small","style":{"spacing":{"padding":{"top":"18px","bottom":"18px"}}}} /-->
 
@@ -34,33 +34,35 @@
 <!-- wp:sensei-lms/ui {"elementClass":"sensei-course-theme__columns","className":"sensei-version\u002d\u002d4-16-2 sensei-course-theme__columns--standalone"} -->
 <div class="wp-block-sensei-lms-ui sensei-course-theme__columns sensei-course-theme__columns--standalone sensei-version--4-16-2">
 
-	<!-- wp:sensei-lms/ui {"elementClass":"sensei-course-theme__main-content","lock":{"move":false,"remove":false},"style"={"spacing":{"margin":{"top":"var:preset|spacing|30"},"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|60","right":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space"}}}} -->
-	<div class="wp-block-sensei-lms-ui sensei-course-theme__main-content" style="margin-top:var(--wp--preset--spacing--30);padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--60);padding-right:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)">
+	<!-- wp:sensei-lms/ui {"elementClass":"sensei-course-theme__main-content","lock":{"move":false,"remove":false},"style"={"spacing":{"padding":{"top":"var:preset|spacing|50","bottom":"var:preset|spacing|50","right":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space"}}}} -->
+	<div class="wp-block-sensei-lms-ui sensei-course-theme__main-content" style="padding-top:var(--wp--preset--spacing--50);padding-bottom:var(--wp--preset--spacing--50);padding-right:var(--wp--preset--spacing--edge-space);padding-left:var(--wp--preset--spacing--edge-space)">
 
-		<!-- wp:post-title {"level":1,"fontSize":"heading-1"} /-->
+		<!-- wp:post-title {"level":1,"style":{"spacing":{"margin":{"top":"0"}},"typography":{"fontStyle":"normal","fontWeight":"600"}},"fontSize":"heading-3","fontFamily":"inter"} /-->
 
 		<!-- wp:post-content {"layout":{"inherit":true}} /-->
 
-		<!-- wp:group {"style":{"spacing":{"margin":{"top":"40px"}}},"layout":{"type":"constrained"},"className":"sensei-lesson-footer"} -->
-		<div class="wp-block-group sensei-lesson-footer" style="margin-top:40px">
-			<!-- wp:sensei-lms/page-actions {"style":{"spacing":{"blockGap":"43px"}}} /-->
+		<?php if ( is_user_logged_in() ) : ?>
+			<!-- wp:group {"style":{"spacing":{"margin":{"top":"40px"}}},"layout":{"type":"constrained"},"className":"sensei-lesson-footer"} -->
+			<div class="wp-block-group sensei-lesson-footer" style="margin-top:40px">
+				<!-- wp:sensei-lms/page-actions {"style":{"spacing":{"blockGap":"43px"}}} /-->
 
-			<!-- wp:group {"style":{"spacing":{"margin":{"top":"20px"}}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
-			<div class="wp-block-group" style="margin-top:20px">
+				<!-- wp:group {"style":{"spacing":{"margin":{"top":"20px"}}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
+				<div class="wp-block-group" style="margin-top:20px">
 
-				<!-- wp:pattern {"slug":"wporg-learn-2024/sensei-lesson-actions"} /-->
+					<!-- wp:pattern {"slug":"wporg-learn-2024/sensei-lesson-actions"} /-->
 
+				</div>
+				<!-- /wp:group -->
 			</div>
 			<!-- /wp:group -->
-		</div>
-		<!-- /wp:group -->
+		<?php endif; ?>
 	</div>
 	<!-- /wp:sensei-lms/ui -->
 </div>
 <!-- /wp:sensei-lms/ui -->
 
-<!-- wp:group {"align":"full","style":{"border":{"top":{"color":"var:preset|color|light-grey-1","width":"1px"},"right":{},"bottom":{},"left":{}},"spacing":{"margin":{"top":"var:preset|spacing|20"},"padding":{"top":"var:preset|spacing|30","right":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space","bottom":"var:preset|spacing|40"}}},"layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull" style="margin-top:var(--wp--preset--spacing--20);padding-top:var(--wp--preset--spacing--30);padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:var(--wp--preset--spacing--40);padding-left:var(--wp--preset--spacing--edge-space);border-top-color:var(--wp--preset--color--light-grey-1);border-top-width:1px">
+<!-- wp:group {"align":"full","style":{"border":{"top":{"color":"var:preset|color|light-grey-1","width":"1px"},"right":{},"bottom":{},"left":{}},"spacing":{"padding":{"top":"var:preset|spacing|30","right":"var:preset|spacing|edge-space","left":"var:preset|spacing|edge-space","bottom":"var:preset|spacing|60"}}},"layout":{"type":"constrained"}} -->
+<div class="wp-block-group alignfull" style="padding-top:var(--wp--preset--spacing--30);padding-right:var(--wp--preset--spacing--edge-space);padding-bottom:var(--wp--preset--spacing--60);padding-left:var(--wp--preset--spacing--edge-space);border-top-color:var(--wp--preset--color--light-grey-1);border-top-width:1px">
 	
 	<!-- wp:group {"layout":{"type":"constrained"}} -->
 	<div class="wp-block-group alignwide">
diff --git a/wp-content/themes/pub/wporg-learn-2024/src/style/_sensei.scss b/wp-content/themes/pub/wporg-learn-2024/src/style/_sensei.scss
index 3da5d3645..2a0d58ee0 100644
--- a/wp-content/themes/pub/wporg-learn-2024/src/style/_sensei.scss
+++ b/wp-content/themes/pub/wporg-learn-2024/src/style/_sensei.scss
@@ -13,62 +13,144 @@ body.sensei {
 	--sensei-lesson-meta-color: var(--wp--preset--color--charcoal-4);
 	--sensei-module-lesson-color: var(--wp--preset--color--charcoal-1);
 
-	.sensei-course-theme-header-content > .wp-block-group {
-		row-gap: 0;
-	}
+	.sensei-course-theme-header-content {
+		> .wp-block-group {
+			row-gap: 0;
+		}
 
-	.sensei-course-theme__columns .sensei-course-theme__sidebar ~ .sensei-course-theme__main-content {
-		--sensei-lm-sidebar-width: calc(280px + (var(--wp--preset--spacing--edge-space) * 2) - 24px);
+		.sensei-course-theme__header__info {
+			gap: var(--wp--preset--spacing--30);
+		}
 
-		@media (max-width: 782px) {
-			--sensei-lm-sidebar-width: 0;
+		.sensei-course-theme-course-progress::after {
+			content: "";
+			display: inline-block;
+			height: 100%;
+			border-right: 1px solid var(--sensei-course-progress-bar-color);
+			position: absolute;
+			margin-left: 30px;
+			top: 0;
 		}
 
-		@media (min-width: 890px) {
-			padding-right: calc(var(--wp--preset--spacing--edge-space) - 24px);
+		.wp-block-sensei-lms-exit-course {
+			margin-left: var(--wp--preset--spacing--30);
 		}
 	}
 
-	.sensei-course-theme__sidebar {
-		row-gap: 40px;
-	}
+	.sensei-course-theme-course-progress-bar {
+		height: 1px !important;
+		display: flex;
+		align-items: center;
 
-	// Remove the border on module title.
-	.wp-block-sensei-lms-course-theme-lesson-module {
-		padding-left: unset;
-		border: none;
+		.sensei-course-theme-course-progress-bar-inner {
+			border-top-right-radius: 5px !important;
+			border-bottom-right-radius: 5px !important;
+			height: 4px !important;
+		}
 	}
 
-	.sensei-lms-course-navigation-module__header {
-		.sensei-collapsible__toggle.sensei-lms-course-navigation-module__button {
-			flex-direction: row-reverse;
-			align-items: flex-start;
-			gap: 0;
+	.sensei-course-theme__columns {
+		margin-top: calc(var(--sensei-lm-header-height) + var(--sensei-wpadminbar-offset, 0px)) !important;
+
+		.sensei-course-theme__sidebar ~ .sensei-course-theme__main-content {
+			--sensei-lm-sidebar-width: calc(280px + (var(--wp--preset--spacing--edge-space) * 2) - 24px);
+			margin-top: 0;
+
+			> * {
+				margin-left: unset;
+				margin-right: unset;
+			}
+
+			@media (max-width: 782px) {
+				--sensei-lm-sidebar-width: 0;
+			}
+
+			@media (min-width: 890px) {
+				padding-right: calc(var(--wp--preset--spacing--edge-space) - 24px);
+			}
+
+			// Remove the border on module title.
+			h3.wp-block-sensei-lms-course-theme-lesson-module {
+				padding-left: unset;
+				border: none;
+				color: var(--wp--preset--color--charcoal-4);
+				margin-block-start: 0;
+			}
+
+			.wp-block-wporg-notice__icon {
+				background: url(../../assets/icon-check.svg);
+				height: 24px;
+			}
+
+			.wp-block-sensei-lms-course-theme-notices {
+				margin-block-end: 39px;
+				margin-block-start: 0;
+
+				&:empty {
+					display: none;
+				}
+			}
 		}
 	}
 
-	.sensei-lms-course-navigation-module__title {
-		font-weight: 700;
+	.sensei-lms-course-navigation-module__summary,
+	.sensei-lms-course-navigation-lesson {
+		margin-top: 12px;
 		font-size: var(--wp--preset--font-size--small);
-		color: var(--wp--preset--color--charcoal-1);
-		margin-top: unset;
-	}
+		line-height: 24px;
 
-	.sensei-lms-course-navigation-module__lessons.sensei-collapsible__content,
-	.sensei-lms-course-navigation-module__summary {
-		padding-left: 24px;
-	}
+		.sensei-lms-course-navigation-lesson__link {
+			color: var(--wp--preset--color--charcoal-4);
+			align-items: flex-start;
 
-	.sensei-lms-course-navigation-module__summary {
-		font-size: var(--wp--preset--font-size--xsmall);
+			.sensei-lms-course-navigation-lesson__status {
+				margin-top: 6px;
+			}
+		}
 	}
 
-	.sensei-lms-course-navigation-lesson {
-		font-size: var(--wp--preset--font-size--small);
+	.sensei-course-theme__sidebar {
+		row-gap: 40px;
+
+		.sensei-lms-course-navigation__modules {
+			gap: var(--wp--preset--spacing--20);
+			margin-left: -6px;
+
+			.sensei-lms-course-navigation-module__lessons.sensei-collapsible__content,
+			.sensei-lms-course-navigation-module__summary {
+				padding-left: 24px;
+			}
 
-		&.status-in-progress,
-		&.status-not-started {
-			--sensei-module-lesson-color: var(--wp--preset--color--charcoal-4);
+			.sensei-lms-course-navigation-module__header {
+				.sensei-collapsible__toggle.sensei-lms-course-navigation-module__button {
+					flex-direction: row-reverse;
+					align-items: flex-start;
+					gap: 0;
+
+					.sensei-lms-course-navigation-module__title {
+						font-weight: 700;
+						font-size: var(--wp--preset--font-size--small);
+						color: var(--wp--preset--color--charcoal-1);
+						margin-top: unset;
+						align-self: center;
+					}
+
+					.sensei-lms-course-navigation-module__collapsible-icon {
+						margin-top: -3px;
+					}
+				}
+			}
+		}
+
+		.sensei-lms-course-navigation__lessons {
+			margin-top: var(--wp--preset--spacing--20);
+
+			.sensei-lms-course-navigation-lesson {
+				&.status-in-progress,
+				&.status-not-started {
+					--sensei-module-lesson-color: var(--wp--preset--color--charcoal-4);
+				}
+			}
 		}
 	}
 
@@ -82,6 +164,11 @@ body.sensei {
 				margin: unset;
 				display: flex;
 				gap: var(--wp--preset--spacing--10);
+				justify-content: space-between;
+
+				@media screen and (max-width: 782px) {
+					flex-direction: column;
+				}
 
 				> *,
 				.sensei-buttons-container__button-block {
@@ -111,9 +198,31 @@ body.sensei {
 		}
 	}
 
-	@media screen and (max-width: 782px) {
-		.sensei-lesson-footer .sensei-lesson-actions-nav {
-			width: 100%;
+	.wp-block-sensei-lms-lesson-actions {
+		.wp-block-sensei-lms-button-view-quiz,
+		.wp-block-sensei-lms-button-complete-lesson {
+			background-color: var(--wp--custom--color--green-50) !important;
+			border-color: transparent;
+
+			&:hover {
+				opacity: 0.9;
+			}
+
+			> button {
+				font-weight: 600 !important;
+				line-height: 1;
+
+				&:focus,
+				&:focus-visible {
+					outline: var(--wp--custom--color--green-50);
+				}
+			}
+		}
+
+		@media screen and (max-width: 782px) {
+			.sensei-lesson-actions-nav a {
+				width: 100% !important;
+			}
 		}
 	}
 
@@ -393,8 +502,17 @@ body.sensei-course-theme {
 
 		@media screen and (max-width: 782px) {
 			top: calc(var(--sensei-lm-header-height));
+			left: 0;
+			right: 0;
 			margin-left: unset;
 			margin-right: unset;
+
+			.sensei-course-theme-course-progress-bar-inner {
+				border-top-left-radius: 0;
+				border-bottom-left-radius: 0;
+				position: relative;
+				top: -0.5px;
+			}
 		}
 	}