diff --git a/assets/calendar.png b/assets/calendar.png
new file mode 100644
index 000000000..1c1baf7c3
Binary files /dev/null and b/assets/calendar.png differ
diff --git a/css/qsm-admin.css b/css/qsm-admin.css
index 45fcead14..f24be67b8 100644
--- a/css/qsm-admin.css
+++ b/css/qsm-admin.css
@@ -799,6 +799,7 @@ ul.changelog li.update div.two:before {
 	flex-direction: row;
 	flex-wrap: wrap;
 	align-items: stretch;
+	border-bottom: 1px solid #cecece;
 }
 .qsm-sub-text-tab-menu {
 	display: inline-block;
@@ -891,10 +892,6 @@ ul.changelog li.update div.two:before {
 	display: inline-block;
 	box-sizing: border-box;
 }
-.qsm_tab_content .subsubsub li {
-	border-left: 2px solid #aaa;
-	padding: 0 5px;
-}
 .qsm_tab_content .subsubsub li:first-child {
 	border-left: 0;
 	padding-left: 0;
@@ -902,7 +899,7 @@ ul.changelog li.update div.two:before {
 .qsm_tab_content .subsubsub li a {
 	font-size: 14px;
 	line-height: 1.2;
-	padding: 0;
+	padding: 10px;
 }
 .qsm_tab_content a:hover,
 .qsm_tab_content a:focus {
@@ -910,6 +907,9 @@ ul.changelog li.update div.two:before {
 	text-decoration: none;
 	box-shadow: none;
 }
+.qsm_tab_content .subsubsub li a.current{
+	border-bottom: 3px solid #00BEE9;
+}
 /* Popup */
 .qsm-popup {
 	font-family: -apple-system, BlinkMacSystemFont, avenir next, avenir, helvetica neue, helvetica, ubuntu, roboto, noto, segoe ui, arial, sans-serif;
@@ -1183,11 +1183,11 @@ h3.addon_category_name {
 .qsm_tab_content input[name="question_limit_key[]"] {
 	max-width: 150px;
 	min-width: 150px;
-} 
+}
 .qsm_tab_content .question_limit_category {
 	max-width: 200px;
 	min-width: 200px;
-} 
+}
 .qsm_tab_content textarea {
 	background: #ffffff none repeat scroll 0 0;
 	border: 1px solid #dddddd;
@@ -1335,8 +1335,15 @@ tr .qsm-opt-desc {
 #quiz_settings_wrapper .qsm-opt-desc {
 	display: none !important;
 }
-.form-table td fieldset label {
+body:not(.qsm_page_qmn_global_settings) .form-table td fieldset label {
 	margin-right: 20px !important;
+	width: 100%;
+}
+#correct_answer_logic {
+    padding-bottom: 10px;
+}
+.qsm-font-light {
+	font-weight: 300;
 }
 .form-table .qsm-opt-tr {
 	position: relative;
@@ -2994,7 +3001,7 @@ input#duplicate_questions {
 	display: flex;
 	flex-direction: row;
 	justify-content: space-between;
-	flex-wrap: wrap;	
+	flex-wrap: wrap;
 	align-items: center;
 	background: #ffffff;
     border-top: 1px solid #DADADA;
@@ -3004,7 +3011,7 @@ input#duplicate_questions {
 }
 .option-page-result-page-tab-footer .result-tab-footer-buttons {
 	display: flex;
-	flex-direction: row;	
+	flex-direction: row;
 }
 .option-page-result-page-tab-footer .footer-bar-notice {
 	display: flex;
@@ -3179,7 +3186,8 @@ input#duplicate_questions {
     	top: 10px;
 	}
 }
-.mlw_quiz_options .qsm_tab_content input[name="end_quiz_if_wrong"]#end_quiz_if_wrong, #end_quiz_if_wrong {
+body .qsm_tab_content .qsm-small-input-field input[type="number"],
+body .qsm_tab_content .qsm-small-input-field input[type="text"] {
 	min-width: 65px;
 	width: 65px;
 	box-shadow: 0 0 0 transparent;
@@ -3188,3 +3196,23 @@ input#duplicate_questions {
     background-color: #fff;
     color: #2c3338;
 }
+.qsm_tab_content input[type=text].qsm-date-picker {
+    background: url(../assets/calendar.png) no-repeat right 10px center;
+    background-size: 14px;
+    padding: 3px 10px;
+    min-width: 100px;
+    background-color: #fff;
+}
+.qsm-quiz-dates fieldset#scheduled_time_start, .qsm-quiz-dates fieldset#scheduled_time_end {
+    display: inline-block;
+}
+.qsm-image-field {
+    display: flex;
+}
+.qsm-image-field span {
+    padding-top: 4px;
+}
+fieldset#enable_quick_correct_answer_info {
+    margin-left: 25px;
+    margin-top: 4px;
+}
\ No newline at end of file
diff --git a/js/qsm-admin.js b/js/qsm-admin.js
index b1459ba50..2e6e4e521 100644
--- a/js/qsm-admin.js
+++ b/js/qsm-admin.js
@@ -63,11 +63,13 @@ var QSMAdmin;
             jQuery(".add-more-link").hide();
         }
         if (jQuery('#limit_category_checkbox-1:checked').length > 0) {
-            jQuery('.qsm_tab_content input[name="question_per_category"],.qsm_tab_content .category_selection_random').parents("tr").hide();
+            jQuery('#question_per_category').hide();
+            jQuery('.category_selection_random').parents("tr").hide();
             jQuery('div.select-category-question-limit-maindiv').parents("tr").show();
         } else {
             jQuery('div.select-category-question-limit-maindiv').parents("tr").hide();
-            jQuery('.qsm_tab_content input[name="question_per_category"],.qsm_tab_content .category_selection_random .qsm_tab_content .category_selection_random').parents("tr").show();
+            jQuery('.category_selection_random').parents("tr").show();
+            jQuery('#question_per_category').show();
         }
         $('.qsm-tab').on('click', function (event) {
             event.preventDefault();
@@ -150,13 +152,31 @@ var QSMAdmin;
         $(document).on('change', '#limit_category_checkbox-1', function (event) {
             event.preventDefault();
             if (jQuery('#limit_category_checkbox-1:checked').length > 0) {
-                jQuery('.qsm_tab_content input[name="question_per_category"],.qsm_tab_content .category_selection_random').parents("tr").hide();
+                jQuery('#question_per_category').hide();
                 jQuery('div.select-category-question-limit-maindiv').parents("tr").show();
+                jQuery('.category_selection_random').parents("tr").hide();
             } else {
                 jQuery('div.select-category-question-limit-maindiv').parents("tr").hide();
-                jQuery('.qsm_tab_content input[name="question_per_category"],.qsm_tab_content .category_selection_random').parents("tr").show();
+                jQuery('#question_per_category').show();
+                jQuery('.category_selection_random').parents("tr").show();
             }
         });
+        show_hide_show_correct_answer();
+        $(document).on('change', '#enable_quick_result_mc-1', function (event) {
+            show_hide_show_correct_answer();
+        });
+        function show_hide_show_correct_answer() {
+            if (jQuery('#enable_quick_result_mc-1:checked').length > 0) {
+                jQuery('#enable_quick_correct_answer_info').css('opacity', '1');
+            } else {
+                jQuery('#enable_quick_correct_answer_info').css('opacity', '0.5');
+            }
+        }
+        jQuery(document).on('change', '#preferred-date-format-custom', function() {
+            let customValue = jQuery(this).val();
+            jQuery('#preferred_date_format label.qsm-option-label:last input[type="radio"]').val(customValue);
+        });
+
         jQuery(document).on('click','.add-more-category', function () {
             let original = jQuery('div.select-category-question-limit-maindiv');
             let lastChild = original.children().last();
@@ -359,22 +379,42 @@ var QSMAdmin;
             e.preventDefault();
             MicroModal.show('show-all-variable');
         });
-        if ( "" != jQuery('#scheduled_time_end').val() ) {
-            jQuery('.not_allow_after_expired_time label').css('opacity', '1');
+        if ( "" != jQuery('#scheduled_time_end-input').val() ) {
+            jQuery('#not_allow_after_expired_time label').css('opacity', '1');
             jQuery('#not_allow_after_expired_time-1').attr('disabled', false);
         } else {
-            jQuery('.not_allow_after_expired_time label').css('opacity', '0.7');
+            jQuery('#not_allow_after_expired_time label').css('opacity', '0.7');
             jQuery('#not_allow_after_expired_time-1').attr('disabled', true);
         }
-        jQuery(document).on('change', '#scheduled_time_end', function () {
+        jQuery(document).on('change', '#scheduled_time_end-input', function () {
             if ( "" != jQuery(this).val() ) {
-                jQuery('.not_allow_after_expired_time label').css('opacity', '1');
+                jQuery('#not_allow_after_expired_time label').css('opacity', '1');
                 jQuery('#not_allow_after_expired_time-1').attr('disabled', false);
             } else {
-                jQuery('.not_allow_after_expired_time label').css('opacity', '0.7');
+                jQuery('#not_allow_after_expired_time label').css('opacity', '0.7');
                 jQuery('#not_allow_after_expired_time-1').attr('disabled', true);
             }
         });
+        if ( 0 != jQuery('#question_from_total-input').val() ) {
+            jQuery('#limit_category_checkbox label').css('opacity', '1');
+            jQuery('#limit_category_checkbox-1').attr('disabled', false);
+            jQuery('#question_per_category').show();
+        } else {
+            jQuery('#limit_category_checkbox label').css('opacity', '0.7');
+            jQuery('#limit_category_checkbox-1').attr('disabled', true);
+            jQuery('#question_per_category').hide();
+        }
+        jQuery(document).on('change', '#question_from_total-input', function () {
+            if ( 0 != jQuery(this).val() ) {
+                jQuery('#limit_category_checkbox label').css('opacity', '1');
+                jQuery('#limit_category_checkbox-1').attr('disabled', false);
+                jQuery('#question_per_category').show();
+            } else {
+                jQuery('#limit_category_checkbox label').css('opacity', '0.7');
+                jQuery('#limit_category_checkbox-1').attr('disabled', true);
+                jQuery('#question_per_category').hide();
+            }
+        });
         //Hide/show tr based on selection
         $('.qsm_tab_content .qsm-opt-tr select').each(function () {
             var name = $(this).attr('name');
@@ -384,38 +424,38 @@ var QSMAdmin;
             }
         });
         $(document).on('change', '.qsm_tab_content select:not(.question_limit_category,.qsm-woo-result-related-products, .qsm-woo-email-related-products), #quiz_settings_wrapper select:not(.question_limit_category)', function () {
-            var name = $(this).attr('name');
             var value = $(this).val();
-            $('.qsm_hidden_tr').hide();
-            if ($('.' + name + '_' + value).length > 0) {
-                hide_show_quiz_options(value);
-            }
+            hide_show_quiz_options(value);
         });
 
         // form_type (0, 1, 2).
         function hide_show_quiz_options(form_type) {
             if (0 == form_type) {
-                $('.qsm_tab_content input[name="system"], .qsm_tab_content input[name="score_roundoff"], .qsm_tab_content input[name="correct_answer_logic"]').parents('tr').show();
+                $('#score_roundoff').parents('tr').show();
+                $('#correct_answer_logic').show();
             } else {
-                $('.qsm_tab_content input[name="score_roundoff"], .qsm_tab_content input[name="correct_answer_logic"]').parents('tr').hide();
+                $('#score_roundoff').parents('tr').hide();
+                $('#correct_answer_logic').hide();
             }
         }
 
         $(document).on('click', '.qsm_tab_content input[name="system"]', function () {
-            var name = $(this).attr('name');
             var value = $(this).val();
-            $('.qsm_hidden_tr_gradingsystem').hide();
+            $('#correct_answer_logic, #score_roundoff').hide();
             if (value == 0 || value == 3) {
-                $('.qsm_hidden_tr_gradingsystem').show();
+                $('#correct_answer_logic, #score_roundoff').show();
             }
         });
         $(document).ready(function () {
             var system_option = $("input[type=radio][name='system']:checked").val();
-            $('.qsm_hidden_tr_gradingsystem').hide();
+            $('#correct_answer_logic, #score_roundoff').hide();
             if (system_option == 0 || system_option == 3) {
-                $('.qsm_hidden_tr_gradingsystem').show();
+                $('#correct_answer_logic, #score_roundoff').show();
+            }
+            hide_show_quiz_options($("input[name='form_type']:checked").val());
+            if (jQuery('.qsm-date-picker').length) {
+                jQuery('.qsm-date-picker').datetimepicker({ format: 'm/d/Y H:i', step: 1});
             }
-            hide_show_quiz_options($("select[name='form_type']").find(":selected").val());
         });
         if ($('.qsm-text-label-wrapper').length > 0) {
             var element_position = $('.qsm-text-label-wrapper').offset().top;
@@ -509,6 +549,24 @@ var QSMAdmin;
             }).open();
         });
 
+        $(document).on('click', '.qsm-image-btn', function (e) {
+            let button = $(this);
+            e.preventDefault();
+            custom_uploader = wp.media({
+                title: qsm_admin_messages.set_feature_img,
+                library: {
+                    type: 'image'
+                },
+                button: {
+                    text: qsm_admin_messages.use_img // button label text
+                },
+                multiple: false
+            }).on('select', function () { // it also has "open" and "close" events
+                let attachment = custom_uploader.state().get('selection').first().toJSON();
+                button.prev('.qsm-image-input').val(attachment.url);
+            }).open();
+        });
+
         // opens media library o set background image for quiz
         $(document).on('click', '.set_background_image', function (e) {
             let button = $(this);
diff --git a/mlw_quizmaster2.php b/mlw_quizmaster2.php
index 7616b755f..a55fcf1f8 100644
--- a/mlw_quizmaster2.php
+++ b/mlw_quizmaster2.php
@@ -361,6 +361,7 @@ public function qsm_admin_scripts_style( $hook ) {
 					wp_enqueue_script( 'jquery-ui-tabs' );
 					wp_enqueue_script( 'jquery-effects-blind' );
 					wp_enqueue_script( 'jquery-effects-explode' );
+					wp_enqueue_media();
 					break;
 				default:
 					wp_enqueue_editor();
diff --git a/php/admin/quiz-options-page.php b/php/admin/quiz-options-page.php
index 491018de3..2755ba359 100644
--- a/php/admin/quiz-options-page.php
+++ b/php/admin/quiz-options-page.php
@@ -338,7 +338,7 @@ function qsm_generate_quiz_options() {
 function qsm_quiz_options_notice_template() {
 	?>
 	<!-- View for Notices -->
-	<script type="text/template" id="tmpl-notice">		
+	<script type="text/template" id="tmpl-notice">
 		<div class="notice notice-large notice-{{data.type}}">
 			<p>{{data.message}}</p>
 		</div>
diff --git a/php/classes/class-qsm-fields.php b/php/classes/class-qsm-fields.php
index 8ec0a5b4a..622b05e18 100644
--- a/php/classes/class-qsm-fields.php
+++ b/php/classes/class-qsm-fields.php
@@ -20,11 +20,11 @@ public static function generate_section( $fields, $section ) {
 		global $mlwQuizMasterNext;
 		global $wpdb;
     	$result_page_fb_image = $mlwQuizMasterNext->pluginHelper->get_section_setting( 'quiz_text', 'result_page_fb_image' );
-		$settings_array_before_update = $mlwQuizMasterNext->pluginHelper->get_quiz_setting( $section );
 		// If nonce is correct, save settings
 		if ( ( isset( $_POST["save_settings_nonce"] ) && wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['save_settings_nonce'] ) ), 'save_settings' ) ) || ( isset( $_POST["set_global_default_settings_nonce"] ) && wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['set_global_default_settings_nonce'] ) ), 'set_global_default_settings' ) ) ) {
 			// Cycle through fields to retrieve all posted values
-			$settings_array = $mlwQuizMasterNext->pluginHelper->get_quiz_setting( $section );
+			$settings_array_before_update = $mlwQuizMasterNext->pluginHelper->get_quiz_setting( $section );
+			$settings_array = array();
 			foreach ( $fields as $field ) {
 				// Sanitize the values based on type
 				$sanitized_value = '';
@@ -69,16 +69,16 @@ public static function generate_section( $fields, $section ) {
 					foreach ( $field["fields"] as $key => $value ) {
 						switch ( $value["type"] ) {
 							case 'url':
-								$sanitized_value = ! empty( $_POST[ $key ] ) ? esc_url_raw( wp_unslash( $_POST[ $key ] ) ) : "";
+								$sanitized_value = isset( $_POST[ $key ] ) ? esc_url_raw( wp_unslash( $_POST[ $key ] ) ) : "";
 								break;
 							case 'checkbox':
 								$sanitized_value = isset( $_POST[ $key ] ) ? sanitize_text_field( wp_unslash( $_POST[ $key ] ) ) : 0;
 								break;
 							case 'number':
-								$sanitized_value = ! empty( $_POST[ $key ] ) ? intval( $_POST[ $key ] ) : "";
+								$sanitized_value = isset( $_POST[ $key ] ) ? intval( $_POST[ $key ] ) : "";
 								break;
 							default:
-								$sanitized_value = ! empty( $_POST[ $key ] ) ? sanitize_text_field( wp_unslash( $_POST[ $key ] ) ) : "";
+								$sanitized_value = isset( $_POST[ $key ] ) ? sanitize_text_field( wp_unslash( $_POST[ $key ] ) ) : "";
 								break;
 						}
 						$settings_array[ $key ] = $sanitized_value;
@@ -90,6 +90,7 @@ public static function generate_section( $fields, $section ) {
 
 			$quiz_id = isset( $_GET["quiz_id"] ) ? intval( $_GET["quiz_id"] ) : 0;
 			// Update the settings and show alert based on outcome
+			$settings_array = wp_parse_args( $settings_array, $settings_array_before_update );
 			$results = $mlwQuizMasterNext->pluginHelper->update_quiz_setting( $section, $settings_array );
 			if ( false !== $results ) {
 				do_action( 'qsm_saved_quiz_settings', $quiz_id, $section, $settings_array );
@@ -110,6 +111,7 @@ public static function generate_section( $fields, $section ) {
     	}
 		// Retrieve the settings for this section
 		$settings = $mlwQuizMasterNext->pluginHelper->get_quiz_setting( $section );
+
 		if ( isset( $settings['form_type'] ) ) {
 			$settings['form_type'] = 2 === intval( $settings['system'] ) ? 1 : $settings['form_type'];
 		}
@@ -327,6 +329,7 @@ public static function generate_section( $fields, $section ) {
 		</form>
 		<?php
   	}
+
 	/**
 	 * Prepares the field and calls the correct generate field function based on field's type
 	 *
@@ -336,7 +339,6 @@ public static function generate_section( $fields, $section ) {
 	 * @return bool False if the field is invalid, true if successful
 	 */
 	public static function generate_field( $field, $value ) {
-
 		// Load default
 		$defaults = array(
 			'id'        => null,
@@ -351,7 +353,6 @@ public static function generate_field( $field, $value ) {
 		if ( ( is_null( $field["id"] ) || empty( $field["id"] ) ) && 'multiple_fields' !== $field['type'] ) {
 			return false;
 		}
-
 		// If type is empty, assume text
 		if ( empty( $field["type"] ) ) {
 			$field["type"] = "text";
@@ -616,11 +617,6 @@ public static function generate_editor_field( $field, $value ) {
 	 * @param mixed $value The current value of the setting
 	 */
 	public static function generate_date_field( $field, $value ) {
-
-		$date_field_script = "jQuery(function() {	jQuery('#" . $field["id"]."').datetimepicker({ format: 'm/d/Y H:i', step: 1});});";
-
-		wp_add_inline_script( 'qsm_admin_js', $date_field_script);
-
 		?>
 		<tr valign="top">
 			<th scope="row" class="qsm-opt-tr">
@@ -635,7 +631,7 @@ public static function generate_date_field( $field, $value ) {
 				<?php if ( isset($field['ph_text']) && '' !== $field['ph_text'] ) { ?>
 				<span class="qsm-ph_text"><?php echo wp_kses_post( $field['ph_text'] ); ?></span>
 				<?php } ?>
-				<input autocomplete="off" type="text" id="<?php echo esc_attr( $field["id"] ); ?>" name="<?php echo esc_attr( $field["id"] ); ?>" value="<?php echo esc_attr( $value ); ?>" />
+				<input class="qsm-date-picker" autocomplete="off" type="text" id="<?php echo esc_attr( $field["id"] ); ?>" name="<?php echo esc_attr( $field["id"] ); ?>" value="<?php echo esc_attr( $value ); ?>" />
 				<?php if ( isset($field['help']) && '' !== $field['help'] ) { ?>
 				<span class="qsm-opt-desc"><?php echo wp_kses_post( $field['help'] ); ?></span>
 				<?php } ?>
@@ -671,7 +667,7 @@ public static function generate_number_field( $field, $value ) {
 				<?php } ?>
 			</th>
 			<td>
-				<?php echo esc_html( $prefix_text ); ?><input class="small-text" type="number" step="1" min="<?php echo ! empty($field['min']) ? esc_attr($field['min']) : 0; ?>" id="<?php echo esc_attr( $field["id"] ); ?>" name="<?php echo esc_attr( $field["id"] ); ?>" value="<?php echo esc_attr($value); ?>" /><?php echo esc_html( $suffix_text ); ?>
+				<?php echo wp_kses_post( $prefix_text ); ?><input class="small-text" type="number" step="1" min="<?php echo ! empty($field['min']) ? esc_attr($field['min']) : 0; ?>" id="<?php echo esc_attr( $field["id"] ); ?>" name="<?php echo esc_attr( $field["id"] ); ?>" value="<?php echo esc_attr($value); ?>" /><?php echo wp_kses_post( $suffix_text ); ?>
 				<?php if ( isset($field['help']) && '' !== $field['help'] ) { ?>
 				<span class="qsm-opt-desc"><?php echo wp_kses_post( $field['help'] ); ?></span>
 				<?php } ?>
@@ -708,8 +704,9 @@ public static function generate_radio_field( $field, $value ) {
 					<?php
 					foreach ( $field["options"] as $option ) {
 						?>
+						<label for="<?php echo esc_attr( $field["id"] . '-' . $option["value"] ); ?>">
 						<input type="radio" id="<?php echo esc_attr( $field["id"] . '-' . $option["value"] ); ?>" name="<?php echo esc_attr( $field["id"] ); ?>" <?php checked( $option["value"], $value ); ?> value="<?php echo esc_attr( $option["value"] ); ?>" />
-						<label for="<?php echo esc_attr( $field["id"] . '-' . $option["value"] ); ?>"><?php echo wp_kses_post( $option["label"] ); ?></label><br />
+						<?php echo wp_kses_post( $option["label"] ); ?></label>
 						<?php
 					}
 					?>
@@ -923,10 +920,12 @@ public static function generate_checkbox_field( $field, $value ) {
 					<?php
 					foreach ( $field["options"] as $option ) {
 						?>
-					<input type="checkbox" id="<?php echo esc_attr( $field["id"] . '-' . $option["value"] ); ?>"
-						name="<?php echo esc_attr( $field["id"] ); ?>" <?php checked( $option["value"], $score_roundoff ); ?>
-						value="<?php echo esc_attr( $option["value"] ); ?>" />
-					<label for="<?php echo esc_attr( $field["id"] . '-' . $option["value"] ); ?>"><?php echo isset( $option["label"] ) ? wp_kses_post( $option["label"] ) : ""; ?></label>
+						<label for="<?php echo esc_attr( $field["id"] . '-' . $option["value"] ); ?>">
+							<input type="checkbox" id="<?php echo esc_attr( $field["id"] . '-' . $option["value"] ); ?>"
+								name="<?php echo esc_attr( $field["id"] ); ?>" <?php checked( $option["value"], $score_roundoff ); ?>
+								value="<?php echo esc_attr( $option["value"] ); ?>" />
+							<?php echo isset( $option["label"] ) ? wp_kses_post( $option["label"] ) : ""; ?>
+						</label>
 					<?php
 					}
 					?>
diff --git a/php/classes/class-qsm-install.php b/php/classes/class-qsm-install.php
index 57be09e0b..58233ff4a 100644
--- a/php/classes/class-qsm-install.php
+++ b/php/classes/class-qsm-install.php
@@ -41,278 +41,240 @@ public function add_hooks() {
 	public function register_default_settings() {
 
 		global $mlwQuizMasterNext;
-
-		// Registers system setting
+		$settings_value = $mlwQuizMasterNext->pluginHelper->get_quiz_setting( 'quiz_options' );
+		$i_tag = '<i class="qsm-font-light">';
+		// Registers require_log_in setting
 		$field_array = array(
-			'id'         => 'form_type',
-			'label'      => __( 'Quiz Type', 'quiz-master-next' ),
-			'type'       => 'select',
-			'options'    => array(
-				array(
-					'label' => __( 'Quiz', 'quiz-master-next' ),
-					'value' => 0,
-				),
-				array(
-					'label' => __( 'Survey', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'Simple Form', 'quiz-master-next' ),
-					'value' => 2,
+			'label'      => __( 'Select Type', 'quiz-master-next' ),
+			'id'         => '',
+			'type'       => 'multiple_fields',
+			'fields'     => array(
+				'form_type'      => array(
+					'type'    => 'radio',
+					'options' => array(
+						array(
+							'label' => __( 'Quiz', 'quiz-master-next' ),
+							'value' => 0,
+						),
+						array(
+							'label' => __( 'Survey', 'quiz-master-next' ),
+							'value' => 1,
+						),
+						array(
+							'label' => __( 'Simple Form', 'quiz-master-next' ),
+							'value' => 2,
+						),
+					),
+					'default' => 0,
+				),
+				'require_log_in' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Allow only logged-in users to access the content', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
 				),
 			),
-			'default'    => 0,
 			'option_tab' => 'general',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
 
 		// Registers system setting
 		$field_array = array(
-			'id'          => 'system',
-			'label'       => __( 'Grading System', 'quiz-master-next' ),
-			'type'        => 'radio',
-			'options'     => array(
-				array(
-					'label' => __( 'Correct/Incorrect', 'quiz-master-next' ),
-					'value' => 0,
-				),
-				array(
-					'label' => __( 'Points', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'Both', 'quiz-master-next' ),
-					'value' => 3,
-				),
-			),
-			'default'     => 0,
-			'help'        => __( 'Select the system for grading the quiz.', 'quiz-master-next' ),
-			'tooltip'     => __( 'To know more about our grading systems please ', 'quiz-master-next' ) . '<a target="_blank" href="'.qsm_get_plugin_link('docs', 'quiz-settings').'">' . __( 'read the documentation.', 'quiz-master-next' ) . '</a>',
-			'show_option' => 'form_type_0',
-			'option_tab'  => 'general',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
 
-		// Registers correct_answer_logic field
-		$field_array = array(
-			'id'          => 'correct_answer_logic',
-			'label'       => __( 'Correct Answer Logic', 'quiz-master-next' ),
-			'type'        => 'radio',
-			'options'     => array(
-				array(
-					'label' => __( 'All correct answers', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'Any correct answer', 'quiz-master-next' ),
-					'value' => 0,
+			'id'         => '',
+			'label'      => __( 'Grading System', 'quiz-master-next' ),
+			'type'       => 'multiple_fields',
+			'fields'     => array(
+				'system'         => array(
+					'type'    => 'radio',
+					'options' => array(
+						array(
+							'label' => __( 'Correct/Incorrect', 'quiz-master-next' ),
+							'value' => 0,
+						),
+						array(
+							'label' => __( 'Points', 'quiz-master-next' ),
+							'value' => 1,
+						),
+						array(
+							'label' => __( 'Both', 'quiz-master-next' ),
+							'value' => 3,
+						),
+					),
+					'default' => 0,
+				),
+				'score_roundoff' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Allow Score Round-off', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
 				),
 			),
-			'default'     => 0,
-			'show_option' => 'qsm_hidden_tr_gradingsystem',
-			'option_tab'  => 'general',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers default number of answers field
-		$field_array = array(
-			'id'         => 'default_answers',
-			'label'      => __( 'Default Number of Answers', 'quiz-master-next' ),
-			'type'       => 'number',
-			'options'    => array(),
-			'default'    => 1,
-			'help'       => __( 'Adds number of answer fields', 'quiz-master-next' ),
+			'tooltip'    => __( 'To know more about our grading systems please ', 'quiz-master-next' ) . '<a target="_blank" href="'.qsm_get_plugin_link('docs', 'quiz-settings').'">' . __( 'read the documentation.', 'quiz-master-next' ) . '</a>',
 			'option_tab' => 'general',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
 
-		// Registers Rounding setting
+		// Registers correct_answer_logic field
 		$field_array = array(
-			'id'          => 'score_roundoff',
-			'label'       => __( 'Allow Score Round-off', 'quiz-master-next' ),
-			'type'        => 'checkbox',
-			'options'     => array(
-				array(
-					'value' => 1,
+			'id'         => '',
+			'type'       => 'multiple_fields',
+			'label'      => __( 'Answer Settings', 'quiz-master-next' ),
+			'fields'     => array(
+				'correct_answer_logic'   => array(
+					'type'        => 'radio',
+					'prefix_text' => __( 'Correct Answer Logic:', 'quiz-master-next' ),
+					'options'     => array(
+						array(
+							'label' => __( 'All correct answers', 'quiz-master-next' ),
+							'value' => 1,
+						),
+						array(
+							'label' => __( 'Any correct answer', 'quiz-master-next' ),
+							'value' => 0,
+						),
+					),
+					'default'     => 0,
+				),
+				'enable_deselect_option' => array(
+					'type'        => 'checkbox',
+					'prefix_text' => __( 'Other Answer Settings:', 'quiz-master-next' ),
+					'options'     => array(
+						array(
+							'label' => __( 'Allow user to deselect an answer and leave it blank. ', 'quiz-master-next' ) . $i_tag . '(' . __( 'Works with multiple choice & horizontal multiple choice questions only', 'quiz-master-next' ) . ')</i>',
+							'value' => 1,
+						),
+					),
+					'default'     => 0,
+				),
+				'form_disable_autofill'  => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Enable auto-fill suggestions for the quiz inputs.', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
+				'disable_mathjax'        => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Allow math formulas for mathematical & technical questions, using TeX and LaTeX notation.', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 1,
 				),
 			),
-			'default'     => 0,
-			'show_option' => 'form_type_0',
-			'option_tab'  => 'general',
+			'option_tab' => 'general',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
 
-		// Registers progress_bar setting
+		// Registers randomness_order setting
 		$field_array = array(
-			'id'         => 'progress_bar',
-			'label'      => __( 'Show progress bar', 'quiz-master-next' ),
+			'id'         => 'randomness_order',
+			'label'      => __( 'Random Questions', 'quiz-master-next' ),
 			'type'       => 'radio',
 			'options'    => array(
 				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
+					'label' => __( 'Random Questions', 'quiz-master-next' ),
 					'value' => 1,
 				),
 				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
+					'label' => __( 'Random Questions And Answers', 'quiz-master-next' ),
+					'value' => 2,
 				),
-			),
-			'default'    => 0,
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers require_log_in setting
-		$field_array = array(
-			'id'         => 'require_log_in',
-			'label'      => __( 'Require User Login', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
 				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
+					'label' => __( 'Random Answers', 'quiz-master-next' ),
+					'value' => 3,
 				),
 				array(
-					'label' => __( 'No', 'quiz-master-next' ),
+					'label' => __( 'Disabled', 'quiz-master-next' ),
 					'value' => 0,
 				),
 			),
 			'default'    => 0,
-			'help'       => __( 'Enabling this allows only logged in users to take the quiz', 'quiz-master-next' ),
-			'option_tab' => 'general',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers pagination setting
-		$field_array = array(
-			'id'         => 'pagination',
-			'label'      => __( 'Questions Per Page', 'quiz-master-next' ),
-			'type'       => 'number',
-			'options'    => array(),
-			'default'    => 0,
-			'help'       => __( 'Override the default pagination created on questions tab', 'quiz-master-next' ),
+			'tooltip'    => __( 'Randomize the order of questions or answers every time a quiz loads', 'quiz-master-next' ),
 			'option_tab' => 'general',
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers timer_limit setting
-		$field_array = array(
-			'id'         => 'timer_limit',
-			'label'      => __( 'Time Limit (in minutes)', 'quiz-master-next' ),
-			'type'       => 'number',
-			'options'    => array(),
-			'default'    => 0,
-			'help'       => __( 'Leave 0 for no time limit', 'quiz-master-next' ),
-			'option_tab' => 'quiz_submission',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Settings for quick result
-		$field_array = array(
-			'id'         => 'enable_result_after_timer_end',
-			'label'      => __( 'Force submit after timer expiry', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'option_tab' => 'quiz_submission',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
 
+		// Registers scheduled_time_start setting
 		$field_array = array(
-			'id'         => 'skip_validation_time_expire',
-			'label'      => __( 'Skip validations when time expire', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
+			'id'              => '',
+			'type'            => 'multiple_fields',
+			'label'           => __( 'Quiz Dates', 'quiz-master-next' ),
+			'fields'          => array(
+				'scheduled_time_start'         => array(
+					'type'        => 'date',
+					'default'     => '',
+					'placeholder' => __( 'Start Date', 'quiz-master-next' ),
+				),
+				'scheduled_time_end'           => array(
+					'type'        => 'date',
+					'default'     => '',
+					'placeholder' => __( 'End Date', 'quiz-master-next' ),
+				),
+				'not_allow_after_expired_time' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Do not allow quiz submission after the end date/time', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
 				),
 			),
-			'default'    => 1,
-			'option_tab' => 'quiz_submission',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers total_user_tries setting
-		$field_array = array(
-			'id'         => 'total_user_tries',
-			'label'      => __( 'Limit Attempts', 'quiz-master-next' ),
-			'type'       => 'number',
-			'options'    => array(),
-			'default'    => 0,
-			'help'       => __( 'Leave 0 for unlimited attempts', 'quiz-master-next' ),
-			'tooltip'    => __( 'Limits how many times a user can take the quiz', 'quiz-master-next' ),
-			'option_tab' => 'quiz_submission',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers limit_total_entries setting
-		$field_array = array(
-			'id'         => 'limit_total_entries',
-			'label'      => __( 'Limit Entries', 'quiz-master-next' ),
-			'type'       => 'number',
-			'options'    => array(),
-			'default'    => 0,
-			'help'       => __( 'Leave 0 for unlimited entries', 'quiz-master-next' ),
-			'tooltip'    => __( 'Limits how many users can take the quiz.', 'quiz-master-next' ),
-			'option_tab' => 'quiz_submission',
+			'container_class' => 'qsm-quiz-dates',
+			'tooltip'         => __( 'Leave blank for no date limit', 'quiz-master-next' ),
+			'option_tab'      => 'general',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
 
 		// Registers question_from_total setting
 		$field_array = array(
-			'id'         => 'question_from_total',
-			'label'      => __( 'Limit number of Questions', 'quiz-master-next' ),
-			'type'       => 'number',
-			'options'    => array(),
-			'default'    => 0,
-			'help'       => __( 'Leave 0 to load all questions', 'quiz-master-next' ),
-			'tooltip'    => __( 'Show only limited number of questions from your quiz.', 'quiz-master-next' ),
-			'option_tab' => 'general',
-		);
-
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-		// Registers Rounding setting
-		$field_array = array(
-			'id'          => 'limit_category_checkbox',
-			'label'       => __( 'Limit questions for each category', 'quiz-master-next' ),
-			'type'        => 'checkbox',
-			'options'     => array(
-				array(
-					'value' => 1,
+			'id'              => '',
+			'type'            => 'multiple_fields',
+			'label'           => __( 'Limit number of Questions', 'quiz-master-next' ),
+			'fields'          => array(
+				'question_from_total'     => array(
+					'type'        => 'number',
+					'suffix_text' => $i_tag . __( 'Maximum question limit', 'quiz-master-next' ) . '</i>',
+					'default'     => 0,
+				),
+				'limit_category_checkbox' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Set questions limit per category', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
+				'question_per_category'   => array(
+					'type'        => 'number',
+					'suffix_text' => '<span class="qsm-opt-tr">' . $i_tag . __( "Limit number of questions per category", "quiz-master-next" ) . '</i> <span class="dashicons dashicons-editor-help qsm-tooltips-icon"><span class="qsm-tooltips">' . __( "Show only limited number of category questions from your quiz.You also need to set Limit Number of questions.", "quiz-master-next" ) . '</span></span><span>',
+					'default'     => 0,
 				),
 			),
-			'default'     => 0,
-			'show_option' => 'form_type_1',
-			'option_tab'  => 'general',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-		// Registers question_per_category setting
-		$field_array = array(
-			'id'         => 'question_per_category',
-			'label'      => __( 'Limit number of Questions Per Category ', 'quiz-master-next' ),
-			'type'       => 'number',
-			'options'    => array(),
-			'default'    => 0,
-			'help'       => __( 'Leave 0 to load all questions. You also need to set Limit Number of questions, as well as select Question Categories', 'quiz-master-next' ),
-			'tooltip'    => __( 'Show only limited number of category questions from your quiz.You also need to set Limit Number of questions.', 'quiz-master-next' ),
-			'option_tab' => 'general',
+			'container_class' => 'qsm-small-input-field',
+			'tooltip'         => __( 'Show only limited number of questions from your quiz.', 'quiz-master-next' ),
+			'option_tab'      => 'general',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
+
 		//Registers category setting
 		$field_array = array(
 			'id'         => 'randon_category',
@@ -337,77 +299,405 @@ public function register_default_settings() {
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
 
+		// Registers default number of answers field
+		$field_array = array(
+			'id'              => 'default_answers',
+			'label'           => __( 'Default Number of Answers', 'quiz-master-next' ),
+			'type'            => 'number',
+			'default'         => 1,
+			'container_class' => 'qsm-small-input-field',
+			'suffix_text'     => $i_tag . __( 'Adds number of answer field', 'quiz-master-next' ) . "</i>",
+			'option_tab'      => 'general',
+		);
+		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
 
-		// Registers randomness_order setting
+		// Registers comment_section setting
 		$field_array = array(
-			'id'         => 'randomness_order',
-			'label'      => __( 'Random Questions', 'quiz-master-next' ),
-			'type'       => 'select',
+			'id'         => 'comment_section',
+			'label'      => __( 'Enable comments', 'quiz-master-next' ),
+			'type'       => 'checkbox',
 			'options'    => array(
 				array(
-					'label' => __( 'Random Questions', 'quiz-master-next' ),
-					'value' => 1,
+					'label' => __( 'Allow users to post comments after completion', 'quiz-master-next' ),
+					'value' => 0,
 				),
-				array(
-					'label' => __( 'Random Questions And Answers', 'quiz-master-next' ),
-					'value' => 2,
+			),
+			'default'    => 1,
+			'option_tab' => 'general',
+		);
+		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
+
+		/* ===== Generat tab end ======== */
+		/* ===== Submission tab start ======== */
+		$field_array = array(
+			'id'              => '',
+			'type'            => 'multiple_fields',
+			'label'           => __( 'Timer Settings', 'quiz-master-next' ),
+			'fields'          => array(
+				'timer_limit'                   => array(
+					'type'        => 'number',
+					'suffix_text' => $i_tag . __( 'minutes', 'quiz-master-next' ) . '</i><label><i><small class="qsm-font-light">' . __( 'Set it to 0 or blank to remove the time restriction.', 'quiz-master-next' ) . '</small></i></label>',
+					'default'     => 0,
+				),
+				'enable_result_after_timer_end' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Auto-submit upon timer expiry', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
+				'skip_validation_time_expire'   => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Ignore validations after timer expires', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
 				),
-				array(
-					'label' => __( 'Random Answers', 'quiz-master-next' ),
-					'value' => 3,
+			),
+			'container_class' => 'qsm-small-input-field',
+			'option_tab'      => 'quiz_submission',
+		);
+		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
+
+		$field_array = array(
+			'id'              => '',
+			'type'            => 'multiple_fields',
+			'label'           => __( 'Answer Controls', 'quiz-master-next' ),
+			'fields'          => array(
+				'end_quiz_if_wrong'       => array(
+					'type'        => 'number',
+					'default'     => 0,
+					'placeholder' => __( 'Set Limit', 'quiz-master-next' ),
+					'suffix_text' => $i_tag . __( 'Incorrect answers will end the quiz', 'quiz-master-next' ) . '</i><label><i><small class="qsm-font-light">' . __( 'Set it to 0 or blank to remove the Incorrect answers limit', 'quiz-master-next' ) . '</small></i></label>',
+				),
+				'disable_answer_onselect' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Prevent users from changing their response.', 'quiz-master-next' ) . $i_tag . '(' . __( 'Works with multiple choice questions only', 'quiz-master-next' ) . ')</i>',
+							'value' => 1,
+						),
+					),
+					'default' => 0,
 				),
-				array(
-					'label' => __( 'Disabled', 'quiz-master-next' ),
-					'value' => 0,
+			),
+			'container_class' => 'qsm-small-input-field',
+			'option_tab'      => 'quiz_submission',
+		);
+		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
+
+		$field_array = array(
+			'id'              => '',
+			'type'            => 'multiple_fields',
+			'label'           => __( 'Quiz Controls', 'quiz-master-next' ),
+			'fields'          => array(
+				'total_user_tries'          => array(
+					'type'        => 'number',
+					'default'     => 0,
+					'placeholder' => __( 'Set Limit', 'quiz-master-next' ),
+					'suffix_text' => $i_tag . __( 'Attempts', 'quiz-master-next' ) . '</i><label><i><small class="qsm-font-light">' . __( 'Set it to 0 or blank to remove the limit on attempts.', 'quiz-master-next' ) . '</small></i></label>',
+				),
+				'limit_total_entries'       => array(
+					'type'        => 'number',
+					'default'     => 0,
+					'placeholder' => __( 'Set Limit', 'quiz-master-next' ),
+					'suffix_text' => $i_tag . __( 'Entries', 'quiz-master-next' ) . '</i><label><i><small class="qsm-font-light">' . __( 'Set it to 0 or blank to remove the limit on entries.', 'quiz-master-next' ) . '</small></i></label>',
+				),
+				'enable_retake_quiz_button' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Allow users to retake the quiz', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
 				),
 			),
-			'default'    => 0,
-			'tooltip'    => __( 'Randomize the order of questions or answers every time a quiz loads', 'quiz-master-next' ),
-			'option_tab' => 'general',
+			'container_class' => 'qsm-small-input-field',
+			'option_tab'      => 'quiz_submission',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
 
-		// Registers scheduled_time_start setting
+		// Registers store_responses setting
 		$field_array = array(
-			'id'         => 'scheduled_time_start',
-			'label'      => __( 'Quiz Dates', 'quiz-master-next' ),
-			'type'       => 'date',
-			'options'    => array(),
-			'default'    => '',
+			'id'         => '',
+			'type'       => 'multiple_fields',
+			'label'      => __( 'Submit Actions', 'quiz-master-next' ),
+			'fields'     => array(
+				'store_responses' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Store results permanently in database', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 1,
+				),
+				'send_email'      => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Send email notifications', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 1,
+				),
+			),
 			'help'       => '',
-			'ph_text'    => __( 'Start Date', 'quiz-master-next' ),
-			'help'       => __( 'If set, Quiz will be accessible only after this date', 'quiz-master-next' ),
-			'tooltip'    => __( 'Leave blank for no date limit', 'quiz-master-next' ),
-			'option_tab' => 'general',
+			'option_tab' => 'quiz_submission',
+		);
+		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
+
+		/* ===== Submission tab end ======== */
+		/* ===== Display tab start ======== */
+		$field_array = array(
+			'id'              => '',
+			'type'            => 'multiple_fields',
+			'label'           => __( 'Progress Controls', 'quiz-master-next' ),
+			'fields'          => array(
+				'progress_bar'                     => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Show progress bar', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 1,
+				),
+				'enable_quick_result_mc'           => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( "Show the results of each question's response in real-time", 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 1,
+				),
+				'enable_quick_correct_answer_info' => array(
+					'type'        => 'radio',
+					'prefix_text' => __( "Display the correct answer information in real-time", 'quiz-master-next' ),
+					'options'     => array(
+						array(
+							'label' => __( "Don’t display correct answer info", 'quiz-master-next' ),
+							'value' => 0,
+						),
+						array(
+							'label' => __( "Display if the selected answer is correct only", 'quiz-master-next' ),
+							'value' => 1,
+						),
+						array(
+							'label' => __( "Display if the selected answer is correct/incorrect", 'quiz-master-next' ),
+							'value' => 2,
+						),
+					),
+					'default'     => 0,
+				),
+			),
+			'help'            => '',
+			'option_tab'      => 'display',
+			'container_class' => 'qsm-progress-control',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
 
-		// Registers scheduled_time_end setting
 		$field_array = array(
-			'id'         => 'scheduled_time_end',
-			'label'      => '',
-			'type'       => 'date',
-			'options'    => array(),
-			'default'    => '',
-			'help'       => __( ' If set, Quiz will not be accessible after this date', 'quiz-master-next' ),
-			'ph_text'    => __( 'End Date', 'quiz-master-next' ),
-			'option_tab' => 'general',
+			'id'              => '',
+			'type'            => 'multiple_fields',
+			'label'           => __( 'Question Settings', 'quiz-master-next' ),
+			'fields'          => array(
+				'pagination'             => array(
+					'type'        => 'number',
+					'default'     => 0,
+					'placeholder' => __( 'Set Limit', 'quiz-master-next' ),
+					'suffix_text' => $i_tag . __( 'Questions Per Page', 'quiz-master-next' ) . '</i><label><i><small class="qsm-font-light">' . __( "Setting a limit overrides the quiz questions' default pagination. Set it to 0 or blank for default pagination.", 'quiz-master-next' ) . '</small></i></label>',
+				),
+				'question_numbering'     => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Show question numbers', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
+				'show_category_on_front' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Display the category name next to each quiz question', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
+			),
+			'container_class' => 'qsm-small-input-field',
+			'option_tab'      => 'display',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
+
 		$field_array = array(
-			'id'         => 'not_allow_after_expired_time',
-			'label'      => '',
-			'type'       => 'checkbox',
-			'options'    => array(
-				array(
-					'value' => 1,
-					'label' => __( 'Do not allow quiz submission after the end date/time', 'quiz-master-next' ),
+			'id'              => '',
+			'type'            => 'multiple_fields',
+			'label'           => __( 'Result Page Controls', 'quiz-master-next' ),
+			'fields'          => array(
+				'show_optin'                             => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Display an opt-in type question response on the results page', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
+				'show_text_html'                         => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Display a Text/HTML type section on the result page', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
+				'hide_correct_answer'                    => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Hide the correct answer from the result page if a user selected the incorrect answer in the quiz', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
+				'show_question_featured_image_in_result' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Display the featured image of the question on the results page', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
+				'disable_description_on_result'          => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Display the question description on the results page', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 1,
 				),
 			),
-			'default'    => 0,
-			'option_tab' => 'general',
+			'container_class' => 'qsm-small-input-field',
+			'option_tab'      => 'display',
+		);
+		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
+
+		$field_array = array(
+			'id'              => '',
+			'type'            => 'multiple_fields',
+			'label'           => __( 'Quiz Page Settings', 'quiz-master-next' ),
+			'fields'          => array(
+				'quiz_animation'         => array(
+					'type'    => 'select',
+					'options' => $mlwQuizMasterNext->pluginHelper->quiz_animation_effect(),
+					'default' => '',
+				),
+				'enable_pagination_quiz' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Display current page number of the quiz', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
+			),
+			'container_class' => 'qsm-small-input-field',
+			'option_tab'      => 'display',
+		);
+		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
+		$preferred_date_format = ! empty( $settings_value['preferred_date_format'] ) && ! in_array( $settings_value['preferred_date_format'], array( 'F j, Y', 'Y-m-d', 'm/d/Y', 'd/m/Y' ), true ) ? $settings_value['preferred_date_format'] : "";
+		$field_array = array(
+			'id'         => '',
+			'type'       => 'multiple_fields',
+			'label'      => __( 'Advanced Settings', 'quiz-master-next' ),
+			'fields'     => array(
+				'result_page_fb_image'               => array(
+					'type'         => 'image',
+					'default'      => QSM_PLUGIN_URL . 'assets/icon-200x200.png',
+					'button_label' => __( 'Select Logo', 'quiz-master-next' ),
+					'suffix'       => '<label><i><small class="qsm-font-light">' . __( "If left blank, the QSM logo will be displayed", 'quiz-master-next' ) . '</small></i></label>',
+				),
+				'ajax_show_correct'                  => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Add class for correct/incorrect answers', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
+				'disable_scroll_next_previous_click' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Disable scroll on next and previous button click', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
+				'preferred_date_format'              => array(
+					'type'    => 'radio',
+					'prefix'  => __( 'Preferred date format:', 'quiz-master-next' ),
+					'options' => array(
+						array(
+							'label' => __( 'June 15, 2023 ', 'quiz-master-next' ) . '<code>F j, Y</code>',
+							'value' => 'F j, Y',
+						),
+						array(
+							'label' => __( '2023-06-15 ', 'quiz-master-next' ) . '<code>Y-m-d</code>',
+							'value' => 'Y-m-d',
+						),
+						array(
+							'label' => __( '06/15/2023 ' , 'quiz-master-next' ) . '<code>m/d/Y</code>',
+							'value' => 'm/d/Y',
+						),
+						array(
+							'label' => __( '15/06/2023 ', 'quiz-master-next' ) . '<code>d/m/Y</code>',
+							'value' => 'd/m/Y',
+						),
+						array(
+							'label' => __( 'Custom', 'quiz-master-next' ) . '<input type="text" id="preferred-date-format-custom" value="'. $preferred_date_format . '"/>',
+							'value' => $preferred_date_format,
+						),
+					),
+					'default' => 'F j, Y',
+				),
+			),
+			'option_tab' => 'display',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
+		/* ===== Display tab end ======== */
+		/* ===== Contact tab start ======== */
 
 		// Registers contact_info_location setting
 		$field_array = array(
@@ -453,31 +743,10 @@ public function register_default_settings() {
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
 
-		// Registers comment_section setting
-		$field_array = array(
-			'id'         => 'comment_section',
-			'label'      => __( 'Enable comments', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 0,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 1,
-				),
-			),
-			'default'    => 1,
-			'help'       => __( 'Allow users to enter their comments after the quiz', 'quiz-master-next' ),
-			'option_tab' => 'general',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers question_numbering setting
+		// Registers hide_auto fill setting
 		$field_array = array(
-			'id'         => 'question_numbering',
-			'label'      => __( 'Show question numbers', 'quiz-master-next' ),
+			'id'         => 'contact_disable_autofill',
+			'label'      => __( 'Disable auto fill for contact input', 'quiz-master-next' ),
 			'type'       => 'radio',
 			'options'    => array(
 				array(
@@ -490,415 +759,13 @@ public function register_default_settings() {
 				),
 			),
 			'default'    => 0,
-			'option_tab' => 'display',
+			'option_tab' => 'contact_form',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers show-optin setting
+		// Setting for display first page
 		$field_array = array(
-			'id'         => 'show_optin',
-			'label'      => __( 'Show Opt-in type Answers to User', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers show-optin setting
-		$field_array = array(
-			'id'         => 'show_text_html',
-			'label'      => __( 'Show Text/HTML type section in result page', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers store_responses setting
-		$field_array = array(
-			'id'         => 'store_responses',
-			'label'      => __( 'Submit Actions', 'quiz-master-next' ),
-			'type'       => 'checkbox',
-			'options'    => array(
-				array(
-					'label' => __( 'Store results permanently in database', 'quiz-master-next' ),
-					'value' => 1,
-				),
-			),
-			'default'    => 1,
-			'help'       => '',
-			'option_tab' => 'quiz_submission',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers send_email setting
-		$field_array = array(
-			'id'         => 'send_email',
-			'label'      => '',
-			'type'       => 'checkbox',
-			'options'    => array(
-				array(
-					'label' => __( 'Send email notifications', 'quiz-master-next' ),
-					'value' => 1,
-				),
-			),
-			'default'    => 1,
-			'help'       => '',
-			'option_tab' => 'quiz_submission',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers disable_answer_onselect setting
-		$field_array = array(
-			'id'         => 'disable_answer_onselect',
-			'label'      => __( 'Disable change of answers', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'help'       => __( 'Works with multiple choice questions only', 'quiz-master-next' ),
-			'tooltip'    => __( 'The question will be disabled once an answer is selected', 'quiz-master-next' ),
-			'option_tab' => 'quiz_submission',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers ajax_show_correct setting
-		$field_array = array(
-			'id'         => 'ajax_show_correct',
-			'label'      => __( 'Add class for correct/incorrect answers', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'help'       => __( 'Works with multiple choice questions only', 'quiz-master-next' ),
-			'tooltip'    => __( 'Dynamically add class for incorrect/correct answer after user selects answer.', 'quiz-master-next' ),
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers hide_auto fill setting
-		$field_array = array(
-			'id'         => 'contact_disable_autofill',
-			'label'      => __( 'Disable auto fill for contact input', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'option_tab' => 'contact_form',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		$field_array = array(
-			'id'         => 'form_disable_autofill',
-			'label'      => __( 'Disable auto fill for Quiz input', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'option_tab' => 'general',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers show category on front setting
-		$field_array = array(
-			'id'         => 'show_category_on_front',
-			'label'      => __( 'Display category name on front end', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Settings for quick result
-		$field_array = array(
-			'id'         => 'enable_quick_result_mc',
-			'label'      => __( 'Show results inline', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'help'       => __( 'Instantly displays the result for each question', 'quiz-master-next' ),
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Settings for quick result
-		$field_array = array(
-			'id'         => 'hide_correct_answer',
-			'label'      => __( 'Hide Correct Answer', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'help'       => __( 'Hide correct answer on result page if user selected wrong answer from quiz.', 'quiz-master-next' ),
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Settings for quick result
-		$field_array = array(
-			'id'         => 'enable_quick_correct_answer_info',
-			'label'      => __( 'Show correct answer inline', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes When answer is correct', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'Yes Independent of correct/incorrect', 'quiz-master-next' ),
-					'value' => 2,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'help'       => __( 'Show correct user info when inline result is enabled.', 'quiz-master-next' ),
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		$field_array = array(
-			'id'              => 'end_quiz_if_wrong',
-			'label'           => __( 'End quiz', 'quiz-master-next' ),
-			'type'            => 'number',
-			'options'         => array(),
-			'default'         => 0,
-			'help'            => __( 'If this set to \'0\' then quiz will not end any incorrect number of answer.', 'quiz-master-next' ),
-			'option_tab'      => 'quiz_submission',
-			'min'             => 0,
-			'container_class' => 'qsm-show-inline-text qsm-correct-incorrect-answer',
-			'prefix_text'     => __( 'If', 'quiz-master-next' ),
-			'suffix_text'     => __( 'wrong answer(s).', 'quiz-master-next' ),
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Setting for retake quiz
-		$field_array = array(
-			'id'         => 'enable_retake_quiz_button',
-			'label'      => __( 'Retake Quiz', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'help'       => __( 'Show a button on result page to retake the quiz', 'quiz-master-next' ),
-			'option_tab' => 'quiz_submission',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Setting for pagination of quiz
-		$field_array = array(
-			'id'         => 'enable_pagination_quiz',
-			'label'      => __( 'Show current page number', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Setting for pagination of quiz
-		$field_array = array(
-			'id'         => 'show_question_featured_image_in_result',
-			'label'      => __( 'Show question featured image in results page', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Setting for pagination of quiz
-		$field_array = array(
-			'id'         => 'enable_deselect_option',
-			'label'      => __( 'Deselect Answer', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'help'       => __( 'Users are able deselect an answer and leave it blank. Works with Multiple Choice and Horizintal Multiple Choice questions only', 'quiz-master-next' ),
-			'option_tab' => 'general',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Setting for pagination of quiz
-		$field_array = array(
-			'id'         => 'disable_description_on_result',
-			'label'      => __( 'Disable description on quiz result page?', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'option_tab' => 'general',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		$field_array = array(
-			'id'         => 'disable_mathjax',
-			'label'      => __( 'Disable MathJax', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'tooltip'    => __( 'Allows you to write math formulas using TeX and LaTeX notation.', 'quiz-master-next' ),
-			'option_tab' => 'general',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Setting for pagination of quiz
-		$field_array = array(
-			'id'         => 'disable_scroll_next_previous_click',
-			'label'      => __( 'Disable scroll on next and previous button click?', 'quiz-master-next' ),
-			'type'       => 'radio',
-			'options'    => array(
-				array(
-					'label' => __( 'Yes', 'quiz-master-next' ),
-					'value' => 1,
-				),
-				array(
-					'label' => __( 'No', 'quiz-master-next' ),
-					'value' => 0,
-				),
-			),
-			'default'    => 0,
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Setting for display first page
-		$field_array = array(
-			'id'         => 'disable_first_page',
-			'label'      => __( 'Disable first page on quiz', 'quiz-master-next' ),
+			'id'         => 'disable_first_page',
+			'label'      => __( 'Disable first page on quiz', 'quiz-master-next' ),
 			'type'       => 'radio',
 			'options'    => array(
 				array(
@@ -915,40 +782,6 @@ public function register_default_settings() {
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
 
-		// Setting for animation
-		$field_array = array(
-			'id'         => 'quiz_animation',
-			'label'      => __( 'Quiz Animation', 'quiz-master-next' ),
-			'type'       => 'select',
-			'options'    => $mlwQuizMasterNext->pluginHelper->quiz_animation_effect(),
-			'default'    => '',
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// result page for sharing
-		$field_array = array(
-			'id'         => 'result_page_fb_image',
-			'label'      => __( 'Logo URL', 'quiz-master-next' ),
-			'type'       => 'url',
-			'default'    => QSM_PLUGIN_URL . 'assets/icon-200x200.png',
-			'tooltip'    => __( 'Enter the url of an image which will be used as logo while sharing on facebook.', 'quiz-master-next' ),
-			'help'       => __( 'If left blank, this will default to QSM logo', 'quiz-master-next' ),
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
-		// Registers Preferred date type settings in the quiz options
-		$field_array = array(
-			'id'         => 'preferred_date_format',
-			'label'      => __( 'Preferred Date Format', 'quiz-master-next' ),
-			'type'       => 'text',
-			'default'    => isset( get_option( 'qsm-quiz-settings' )['preferred_date_format'] ) ? get_option( 'qsm-quiz-settings' )['preferred_date_format'] : get_option( 'date_format' ),
-			'help'       => __( 'Overrides global settings for preferred date format', 'quiz-master-next' ),
-			'option_tab' => 'display',
-		);
-		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
-
 		do_action( 'qsm_extra_setting_fields' );
 
 		// Registers social_media setting
@@ -1069,6 +902,7 @@ public function register_default_settings() {
 			'option_tab' => 'legacy',
 		);
 		$mlwQuizMasterNext->pluginHelper->register_quiz_setting( $field_array, 'quiz_options' );
+		/* ===== Contact tab end ======== */
 
 		// Registers message_before setting
 		$field_array = array(
diff --git a/php/classes/class-qsm-settings.php b/php/classes/class-qsm-settings.php
index b39d73dde..863894099 100644
--- a/php/classes/class-qsm-settings.php
+++ b/php/classes/class-qsm-settings.php
@@ -430,7 +430,9 @@ private function load_settings() {
 					// Check if setting exists in section settings and, if not, set it to the default
 					if ( ! empty( $field['type'] ) && 'multiple_fields' === $field['type'] ) {
 						foreach ( $field['fields'] as $key => $value ) {
-							$unserialized_section[ $key ] = $value['default'];
+							if ( ! isset( $unserialized_section[ $key ] ) ) {
+								$unserialized_section[ $key ] = $value['default'];
+							}
 						}
 					} elseif ( ! isset( $unserialized_section[ $field['id'] ] ) ) {
 						$unserialized_section[ $field['id'] ] = $field['default'];
@@ -440,6 +442,7 @@ private function load_settings() {
 			}
 		}
 		$this->settings = $settings_array;
+
 	}
 
 	/**