diff --git a/php/class-customize-snapshot-manager.php b/php/class-customize-snapshot-manager.php
index 4c306f4e..b3dc3a4e 100644
--- a/php/class-customize-snapshot-manager.php
+++ b/php/class-customize-snapshot-manager.php
@@ -1406,7 +1406,7 @@ public function remove_all_non_snapshot_admin_bar_links( $wp_admin_bar ) {
 	public function render_templates() {
 		$data = $this->get_month_choices();
 
-		$description = __( 'Schedule your changes to publish (go live) at a future date.', 'customize-snapshots' );
+		$description = __( 'Schedule changes to publish (go live) at a future date.', 'customize-snapshots' );
 		?>
 		<script type="text/html" id="tmpl-snapshot-preview-link">
 			<a href="#" target="frontend-preview" id="snapshot-preview-link" class="dashicons dashicons-welcome-view-site" title="<?php esc_attr_e( 'View on frontend', 'customize-snapshots' ) ?>">
@@ -1430,17 +1430,17 @@ public function render_templates() {
 
 				<ul class="snapshot-controls">
 					<li class="snapshot-control">
-						<span class="customize-control-title snapshot-control-title">
-							<?php esc_html_e( 'Snapshot Title', 'customize-snapshots' ); ?>
-						</span>
+						<label for="snapshot-title" class="customize-control-title snapshot-control-title">
+							<?php esc_html_e( 'Title', 'customize-snapshots' ); ?>
+						</label>
 						<input id="snapshot-title" type="text" value="{{data.title}}">
 					</li>
 					<# if ( data.currentUserCanPublish ) { #>
 						<li class="snapshot-control">
-							<span class="customize-control-title snapshot-control-title">
-								<?php esc_html_e( 'Snapshot Scheduling', 'customize-snapshots' ); ?>
+							<label for="snapshot-date-month" class="customize-control-title snapshot-control-title">
+								<?php esc_html_e( 'Scheduling', 'customize-snapshots' ); ?>
 								<span class="reset-time">(<a href="#" title="<?php esc_attr_e( 'Reset scheduled date to original or current date', 'customize-snapshots' ); ?>"><?php esc_html_e( 'Reset', 'customize-snapshots' ) ?></a>)</span>
-							</span>
+							</label>
 							<p class="snapshot-schedule-description">
 								<?php echo esc_html( $description ); ?>
 							</p>
@@ -1449,10 +1449,8 @@ public function render_templates() {
 									<span class="screen-reader-text"><?php esc_html_e( 'Month', 'customize-snapshots' ); ?></span>
 									<#
 									_.defaults( data, <?php echo wp_json_encode( $data ) ?> );
-									data.input_id_post_date = 'input-' + String( Math.random() );
-									data.input_id_post_date_gmt = 'input-' + String( Math.random() );
 									#>
-									<select id="{{ data.input_id }}" class="date-input month" data-date-input="month">
+									<select id="snapshot-date-month" class="date-input month" data-date-input="month">
 									<# _.each( data.month_choices, function( choice ) { #>
 										<# if ( _.isObject( choice ) && ! _.isUndefined( choice.text ) && ! _.isUndefined( choice.value ) ) {
 											text = choice.text;