diff --git a/views/admin-page-settings.php b/views/admin-page-settings.php
index ab565e7bd..a52458ca0 100644
--- a/views/admin-page-settings.php
+++ b/views/admin-page-settings.php
@@ -28,12 +28,7 @@
 				<div class="prpl-pages-list">
 					<?php foreach ( \progress_planner()->get_admin__page_settings()->get_tabs_settings() as $prpl_tab_key => $prpl_tab ) : ?>
 						<?php foreach ( $prpl_tab['settings'] as $prpl_setting ) : ?>
-							<div
-								class="prpl-pages-item prpl-pages-item-<?php echo esc_attr( $prpl_setting['page'] ); ?>"
-								data-page-item="<?php echo esc_attr( $prpl_setting['page'] ); ?>"
-							>
-								<?php \progress_planner()->the_view( "setting/{$prpl_setting['type']}.php", [ 'prpl_setting' => $prpl_setting ] ); ?>
-							</div>
+							<?php \progress_planner()->the_view( "setting/{$prpl_setting['type']}.php", [ 'prpl_setting' => $prpl_setting ] ); ?>
 						<?php endforeach; ?>
 					<?php endforeach; ?>
 
diff --git a/views/setting/page-select.php b/views/setting/page-select.php
index ad69fec0c..e7e2e6008 100644
--- a/views/setting/page-select.php
+++ b/views/setting/page-select.php
@@ -25,61 +25,66 @@
 }
 
 ?>
-<prpl-page-select>
-	<div class="item-description">
-		<h3><?php echo esc_html( $prpl_setting['title'] ); ?></h3>
-		<p><?php echo esc_html( $prpl_setting['description'] ); ?></p>
-	</div>
-	<div>
-		<fieldset id="prpl-setting-fieldset-<?php echo esc_attr( $prpl_setting['id'] ); ?>">
-			<div class="radios">
-				<?php foreach ( $prpl_radios as $prpl_r_value => $prpl_r_label ) : ?>
-					<label>
-						<input type="radio" id="<?php echo esc_attr( 'pages[' . esc_attr( $prpl_setting['id'] ) . '][have_page]' ); ?>" name="<?php echo esc_attr( 'pages[' . esc_attr( $prpl_setting['id'] ) . '][have_page]' ); ?>" value="<?php echo esc_attr( $prpl_r_value ); ?>" data-page="<?php echo esc_attr( $prpl_setting['page'] ); ?>" <?php checked( $prpl_radio_value, $prpl_r_value ); ?>>
-						<?php echo esc_html( $prpl_r_label ); ?>
-					</label>
-				<?php endforeach; ?>
+<div
+	class="prpl-pages-item prpl-pages-item-<?php echo esc_attr( $prpl_setting['page'] ); ?>"
+	data-page-item="<?php echo esc_attr( $prpl_setting['page'] ); ?>"
+>
+	<prpl-page-select>
+		<div class="item-description">
+				<h3><?php echo esc_html( $prpl_setting['title'] ); ?></h3>
+			<p><?php echo esc_html( $prpl_setting['description'] ); ?></p>
+		</div>
+		<div>
+			<fieldset id="prpl-setting-fieldset-<?php echo esc_attr( $prpl_setting['id'] ); ?>">
+				<div class="radios">
+					<?php foreach ( $prpl_radios as $prpl_r_value => $prpl_r_label ) : ?>
+						<label>
+							<input type="radio" id="<?php echo esc_attr( 'pages[' . esc_attr( $prpl_setting['id'] ) . '][have_page]' ); ?>" name="<?php echo esc_attr( 'pages[' . esc_attr( $prpl_setting['id'] ) . '][have_page]' ); ?>" value="<?php echo esc_attr( $prpl_r_value ); ?>" data-page="<?php echo esc_attr( $prpl_setting['page'] ); ?>" <?php checked( $prpl_radio_value, $prpl_r_value ); ?>>
+							<?php echo esc_html( $prpl_r_label ); ?>
+						</label>
+					<?php endforeach; ?>
+				</div>
+			</fieldset>
+		</div>
+		<div class="item-actions">
+			<div class="prpl-select-page">
+				<div data-action="select">
+					<?php
+					wp_dropdown_pages(
+						[
+							'name'             => 'pages[' . esc_attr( $prpl_setting['id'] ) . '][id]',
+							'show_option_none' => '&mdash; ' . esc_html__( 'Select page', 'progress-planner' ) . ' &mdash;',
+							'selected'         => $prpl_setting['value'], // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+						]
+					);
+					?>
+				</div>
+				<div data-action="edit">
+					<a
+						target="_blank"
+						class="button"
+						href=""
+						data-page="<?php echo esc_attr( $prpl_setting['page'] ); ?>"
+					>
+						<?php esc_html_e( 'Edit', 'progress-planner' ); ?>
+					</a>
+				</div>
 			</div>
-		</fieldset>
-	</div>
-	<div class="item-actions">
-		<div class="prpl-select-page">
-			<div data-action="select">
+
+			<div data-action="create">
 				<?php
-				wp_dropdown_pages(
-					[
-						'name'             => 'pages[' . esc_attr( $prpl_setting['id'] ) . '][id]',
-						'show_option_none' => '&mdash; ' . esc_html__( 'Select page', 'progress-planner' ) . ' &mdash;',
-						'selected'         => $prpl_setting['value'], // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
-					]
-				);
+				/**
+				 * TODO: Find a way to assign the post-meta for the new page.
+				 */
 				?>
-			</div>
-			<div data-action="edit">
 				<a
 					target="_blank"
 					class="button"
-					href=""
-					data-page="<?php echo esc_attr( $prpl_setting['page'] ); ?>"
+					href="<?php echo esc_url( admin_url( 'post-new.php?post_type=page' ) ); ?>"
 				>
-					<?php esc_html_e( 'Edit', 'progress-planner' ); ?>
+					<?php esc_html_e( 'Create', 'progress-planner' ); ?>
 				</a>
 			</div>
 		</div>
-
-		<div data-action="create">
-			<?php
-			/**
-			 * TODO: Find a way to assign the post-meta for the new page.
-			 */
-			?>
-			<a
-				target="_blank"
-				class="button"
-				href="<?php echo esc_url( admin_url( 'post-new.php?post_type=page' ) ); ?>"
-			>
-				<?php esc_html_e( 'Create', 'progress-planner' ); ?>
-			</a>
-		</div>
-	</div>
-</prpl-page-select>
+	</prpl-page-select>
+</div>