diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1023f67..e2344929 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [4.0.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.11.1...v4.0.0) (2023-10-10)
+
+
+### ⚠ BREAKING CHANGES
+
+* **Programme/Shortcodes:** Custom code with `do_shortcode` now needs to do
+`echo do_shortcode( '[eduadmin-programme-list]' );` after the change.
+Which is the intended way to use `do_shortcode` the previous versions
+were not working in the correct way.
+
+### Bug Fixes
+
+* **Programme/Shortcodes:** Fixed an issue with Programme pages ([461c3bf](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/461c3bfac424d8614580ac4f7df2fe5d70161499))
+
 ### [3.11.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.11.0...v3.11.1) (2023-10-09)
 
 
diff --git a/PLUGIN-CHECKSUM b/PLUGIN-CHECKSUM
index 410f5285..467cf217 100644
--- a/PLUGIN-CHECKSUM
+++ b/PLUGIN-CHECKSUM
@@ -1 +1 @@
-081e6567affebd04ee2bd149100373bf
+f225964c4ebc0fdc2db8e51049e166ae
diff --git a/content/template/myPagesTemplate/login.php b/content/template/myPagesTemplate/login.php
index a2815b3d..f665cbac 100644
--- a/content/template/myPagesTemplate/login.php
+++ b/content/template/myPagesTemplate/login.php
@@ -19,11 +19,7 @@
 		require_once 'profile.php';
 	}
 } else {
-	if ( isset( $q['edu-login'] ) ) {
-		require_once 'login-page.php';
-	} else {
-		require_once 'login-page.php';
-	}
+	require_once 'login-page.php';
 }
 
 $out = ob_get_clean();
diff --git a/content/template/programme/book.php b/content/template/programme/book.php
index e31111d0..997b06a4 100644
--- a/content/template/programme/book.php
+++ b/content/template/programme/book.php
@@ -1,4 +1,5 @@
 <?php
+ob_start();
 // phpcs:disable WordPress.NamingConventions,Squiz
 
 if ( ! empty( $_POST['edu-valid-form'] ) && wp_verify_nonce( $_POST['edu-valid-form'], 'edu-booking-confirm' ) && isset( $_POST['act'] ) && 'bookProgramme' === sanitize_text_field( $_POST['act'] ) ) {
@@ -643,3 +644,6 @@ class="last-name" name="contactLastName" maxlength="100"
 	<?php
 	do_action( 'eduadmin-programme-bookingform-view', $programme );
 }
+$out = ob_get_clean();
+
+return $out;
\ No newline at end of file
diff --git a/content/template/programme/detail.php b/content/template/programme/detail.php
index 2c99cdf7..dcdbee1b 100644
--- a/content/template/programme/detail.php
+++ b/content/template/programme/detail.php
@@ -1,43 +1,48 @@
 <?php
+ob_start();
 $show_headers = EDU()->is_checked( 'eduadmin-showDetailHeaders', true );
 ?>
-<div class="eduadmin" data-courseid="<?php echo esc_attr( $programme['ProgrammeId'] ); ?>"
-     data-eventid="<?php echo( isset( $_REQUEST['id'] ) ? esc_attr( sanitize_text_field( $_REQUEST['id'] ) ) : '' ); ?>">
-	<?php if ( ! empty( $programme['ImageUrl'] ) ) : ?>
-		<img src="<?php echo esc_url( $programme['ImageUrl'] ); ?>" class="courseImage" />
-	<?php endif; ?>
-	<h1 class="courseTitle"><?php echo esc_html( $programme['ProgrammeName'] ); ?></h1>
-	<?php if ( ! empty( $programme['Description'] ) ) : ?><?php if ( $show_headers ) { ?>
-		<h2><?php echo esc_html_x( 'Description', 'frontend', 'eduadmin-booking' ); ?></h2>
-	<?php } ?><?php echo wp_kses_post( $programme['Description'] ); ?><?php endif; ?>
-	<?php if ( ! empty( $programme['Prerequisites'] ) ) : ?><?php if ( $show_headers ) { ?>
-		<h2><?php echo esc_html_x( 'Prerequisites', 'frontend', 'eduadmin-booking' ); ?></h2>
-	<?php } ?><?php echo wp_kses_post( $programme['Prerequisites'] ); ?><?php endif; ?>
-	<?php if ( ! empty( $programme['TargetGroup'] ) ) : ?><?php if ( $show_headers ) { ?>
-		<h2><?php echo esc_html_x( 'Target Group', 'frontend', 'eduadmin-booking' ); ?></h2>
-	<?php } ?><?php echo wp_kses_post( $programme['TargetGroup'] ); ?><?php endif; ?>
-	<?php if ( ! empty( $programme['Courses'] ) ) : ?><?php if ( $show_headers ) { ?>
-		<h2><?php echo esc_html_x( 'Modules', 'frontend', 'eduadmin-booking' ); ?></h2>
-	<?php } ?>
-		<ul>
-			<?php
-			foreach ( $programme['Courses'] as $module ) {
-				// TODO: Add link to course template page
-				echo '<li>' . esc_html( $module['CourseName'] ) . '</li>';
-			}
-			?>
-		</ul>
-	<?php
-	endif;
-	?>
-	<h2><?php echo esc_html_x( 'Programme starts', 'frontend', 'eduadmin-booking' ); ?></h2>
-	<?php
-	if ( ! empty( $programme['ProgrammeStarts'] ) ) {
-		include_once 'template/detail-list.php';
-	} else {
-		echo '<i>' . esc_html_x( 'No programme starts available', 'frontend', 'eduadmin-booking' ) . '</i>';
-	}
+	<div class="eduadmin" data-courseid="<?php echo esc_attr( $programme['ProgrammeId'] ); ?>"
+	     data-eventid="<?php echo( isset( $_REQUEST['id'] ) ? esc_attr( sanitize_text_field( $_REQUEST['id'] ) ) : '' ); ?>">
+		<?php if ( ! empty( $programme['ImageUrl'] ) ) : ?>
+			<img src="<?php echo esc_url( $programme['ImageUrl'] ); ?>" class="courseImage" />
+		<?php endif; ?>
+		<h1 class="courseTitle"><?php echo esc_html( $programme['ProgrammeName'] ); ?></h1>
+		<?php if ( ! empty( $programme['Description'] ) ) : ?><?php if ( $show_headers ) { ?>
+			<h2><?php echo esc_html_x( 'Description', 'frontend', 'eduadmin-booking' ); ?></h2>
+		<?php } ?><?php echo wp_kses_post( $programme['Description'] ); ?><?php endif; ?>
+		<?php if ( ! empty( $programme['Prerequisites'] ) ) : ?><?php if ( $show_headers ) { ?>
+			<h2><?php echo esc_html_x( 'Prerequisites', 'frontend', 'eduadmin-booking' ); ?></h2>
+		<?php } ?><?php echo wp_kses_post( $programme['Prerequisites'] ); ?><?php endif; ?>
+		<?php if ( ! empty( $programme['TargetGroup'] ) ) : ?><?php if ( $show_headers ) { ?>
+			<h2><?php echo esc_html_x( 'Target Group', 'frontend', 'eduadmin-booking' ); ?></h2>
+		<?php } ?><?php echo wp_kses_post( $programme['TargetGroup'] ); ?><?php endif; ?>
+		<?php if ( ! empty( $programme['Courses'] ) ) : ?><?php if ( $show_headers ) { ?>
+			<h2><?php echo esc_html_x( 'Modules', 'frontend', 'eduadmin-booking' ); ?></h2>
+		<?php } ?>
+			<ul>
+				<?php
+				foreach ( $programme['Courses'] as $module ) {
+					// TODO: Add link to course template page
+					echo '<li>' . esc_html( $module['CourseName'] ) . '</li>';
+				}
+				?>
+			</ul>
+		<?php
+		endif;
+		?>
+		<h2><?php echo esc_html_x( 'Programme starts', 'frontend', 'eduadmin-booking' ); ?></h2>
+		<?php
+		if ( ! empty( $programme['ProgrammeStarts'] ) ) {
+			include_once 'template/detail-list.php';
+		} else {
+			echo '<i>' . esc_html_x( 'No programme starts available', 'frontend', 'eduadmin-booking' ) . '</i>';
+		}
 
-	do_action( 'eduadmin-programme-detail-view', $programme );
-	?>
-</div>
+		do_action( 'eduadmin-programme-detail-view', $programme );
+		?>
+	</div>
+<?php
+$out = ob_get_clean();
+
+return $out;
\ No newline at end of file
diff --git a/content/template/programme/list.php b/content/template/programme/list.php
index aeb59169..d7ccf77d 100644
--- a/content/template/programme/list.php
+++ b/content/template/programme/list.php
@@ -1,4 +1,5 @@
 <?php
+ob_start();
 $spot_left_option = EDU()->get_option( 'eduadmin-spotsLeft', 'exactNumbers' );
 $always_few_spots = EDU()->get_option( 'eduadmin-alwaysFewSpots', '3' );
 $spot_settings    = EDU()->get_option( 'eduadmin-spotsSettings', "1-5\n5-10\n10+" );
@@ -22,3 +23,6 @@
 	</div>
 	<?php
 }
+$out = ob_get_clean();
+
+return $out;
\ No newline at end of file
diff --git a/eduadmin.php b/eduadmin.php
index bded8450..2a5084af 100644
--- a/eduadmin.php
+++ b/eduadmin.php
@@ -9,7 +9,7 @@
  * Plugin URI:	https://www.eduadmin.se
  * Description:	EduAdmin plugin to allow visitors to book courses at your website
  * Tags:	booking, participants, courses, events, eduadmin, lega online
- * Version:	3.11.1
+ * Version:	4.0.0
  * GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
  * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
  * Requires at least: 5.8
diff --git a/includes/edu-shortcodes.php b/includes/edu-shortcodes.php
index 057ce017..e03df9d9 100644
--- a/includes/edu-shortcodes.php
+++ b/includes/edu-shortcodes.php
@@ -658,12 +658,11 @@ function eduadmin_get_login_view( $attributes ) {
 		normalize_empty_atts( $attributes ),
 		'eduadmin-loginview'
 	);
-	EDU()->stop_timer( $t );
 
-	ob_start();
-	include_once EDUADMIN_PLUGIN_PATH . '/content/template/myPagesTemplate/login.php';
+	$str = include_once EDUADMIN_PLUGIN_PATH . '/content/template/myPagesTemplate/login.php';
+	EDU()->stop_timer( $t );
 
-	return ob_get_clean();
+	return $str;
 }
 
 function eduadmin_get_programme_list( $attributes ) {
@@ -699,10 +698,7 @@ function eduadmin_get_programme_list( $attributes ) {
 		'StartDate),Courses'
 	);
 
-	ob_start();
-	include_once EDUADMIN_PLUGIN_PATH . '/content/template/programme/list.php';
-
-	return ob_get_clean();
+	return include_once EDUADMIN_PLUGIN_PATH . '/content/template/programme/list.php';
 }
 
 function eduadmin_get_programme_details( $attributes ) {
@@ -753,11 +749,10 @@ function eduadmin_get_programme_details( $attributes ) {
 			'),PriceNames'
 		);
 
-		ob_start();
-		include_once EDUADMIN_PLUGIN_PATH . '/content/template/programme/detail.php';
-
-		return ob_get_clean();
+		return include_once EDUADMIN_PLUGIN_PATH . '/content/template/programme/detail.php';
 	}
+
+	return '';
 }
 
 function eduadmin_get_programme_booking( $attributes ) {
@@ -804,11 +799,10 @@ function eduadmin_get_programme_booking( $attributes ) {
 			'Courses,Events,PaymentMethods,PriceNames'
 		);
 
-		ob_start();
-		include_once EDUADMIN_PLUGIN_PATH . '/content/template/programme/book.php';
-
-		return ob_get_clean();
+		return include_once EDUADMIN_PLUGIN_PATH . '/content/template/programme/book.php';
 	}
+
+	return '';
 }
 
 if ( is_callable( 'add_shortcode' ) ) {
diff --git a/package.json b/package.json
index 0eca1e7a..84d4a6f7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "eduadmin-wordpress-plugin",
 	"private": true,
-	"version": "3.11.1",
+	"version": "4.0.0",
 	"repository": "https://github.com/MultinetInteractive/EduAdmin-WordPress.git",
 	"author": "Chris Gårdenberg <chga@multinet.se>",
 	"license": "MIT",
diff --git a/readme.md b/readme.md
index 57151813..945c4dad 100644
--- a/readme.md
+++ b/readme.md
@@ -1,7 +1,7 @@
 # EduAdmin Booking
 - Requires at least: 5.8
 - Tested up to: 6.4
-- Stable tag: 3.11.1
+- Stable tag: 4.0.0
 - Requires PHP: 7.0
 - License: GPL3
 - License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
@@ -40,6 +40,20 @@ If you notice that your API key doesn't work any more, you have to contact us.
 
 The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md)
 
+### [4.0.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.11.1...v4.0.0) (2023-10-10)
+
+
+#### ⚠ BREAKING CHANGES
+
+* **Programme/Shortcodes:** Custom code with `do_shortcode` now needs to do
+`echo do_shortcode( '[eduadmin-programme-list]' );` after the change.
+Which is the intended way to use `do_shortcode` the previous versions
+were not working in the correct way.
+
+#### Bug Fixes
+
+* **Programme/Shortcodes:** Fixed an issue with Programme pages ([461c3bf](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/461c3bfac424d8614580ac4f7df2fe5d70161499))
+
 ### [3.11.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.11.0...v3.11.1) (2023-10-09)
 
 
@@ -61,12 +75,5 @@ The full changelog available on [GitHub](https://github.com/MultinetInteractive/
 
 * Programme starts now show number of spots left (according to settings) ([0117df4](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/0117df408a557998bd04d467720e51cef331612a)), closes [#498](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/498)
 
-### [3.9.2](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.9.1...v3.9.2) (2023-09-26)
-
-
-#### Refactoring
-
-* Made a readme.txt as well, for use in the SVN trunk. ([e6b6d61](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/e6b6d61b8e3f27c2841c25812f46f6d2cde3ead3))
-
 
 
diff --git a/readme.txt b/readme.txt
index a2b0cb96..2269c272 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: mnchga
 Tags: booking, participants, courses, events, eduadmin, lega online
 Requires at least: 5.8
 Tested up to: 6.4
-Stable tag: 3.11.1
+Stable tag: 4.0.0
 Requires PHP: 7.0
 License: GPL3
 License URI: https://www.gnu.org/licenses/gpl-3.0.en.html
@@ -45,6 +45,20 @@ If you notice that your API key doesn't work any more, you have to contact us.
 
 The full changelog available on [GitHub](https://github.com/MultinetInteractive/EduAdmin-WordPress/blob/production/CHANGELOG.md)
 
+### [4.0.0](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.11.1...v4.0.0) (2023-10-10)
+
+
+#### ⚠ BREAKING CHANGES
+
+* **Programme/Shortcodes:** Custom code with `do_shortcode` now needs to do
+`echo do_shortcode( '[eduadmin-programme-list]' );` after the change.
+Which is the intended way to use `do_shortcode` the previous versions
+were not working in the correct way.
+
+#### Bug Fixes
+
+* **Programme/Shortcodes:** Fixed an issue with Programme pages ([461c3bf](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/461c3bfac424d8614580ac4f7df2fe5d70161499))
+
 ### [3.11.1](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.11.0...v3.11.1) (2023-10-09)
 
 
@@ -66,12 +80,5 @@ The full changelog available on [GitHub](https://github.com/MultinetInteractive/
 
 * Programme starts now show number of spots left (according to settings) ([0117df4](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/0117df408a557998bd04d467720e51cef331612a)), closes [#498](https://github.com/MultinetInteractive/EduAdmin-WordPress/issues/498)
 
-### [3.9.2](https://github.com/MultinetInteractive/EduAdmin-WordPress/compare/v3.9.1...v3.9.2) (2023-09-26)
-
-
-#### Refactoring
-
-* Made a readme.txt as well, for use in the SVN trunk. ([e6b6d61](https://github.com/MultinetInteractive/EduAdmin-WordPress/commit/e6b6d61b8e3f27c2841c25812f46f6d2cde3ead3))
-