diff --git a/css/common.css b/css/common.css
index a2d935570..79357c6fa 100644
--- a/css/common.css
+++ b/css/common.css
@@ -175,7 +175,7 @@ body .qsm-popup__btn-primary {
 	border-radius: 0;
 	height: 20px;
 }
-.question-type-polar-s .ui-widget-content .ui-slider-handle { 
+.question-type-polar-s .ui-widget-content .ui-slider-handle {
 	background: rgb(119, 113, 113);
 	height: 32px;
 	border-color: rgb(119, 113, 113);
@@ -194,9 +194,6 @@ body .qsm-popup__btn-primary {
 .qsm-deselect-answer {
 	float: right;
 }
-.qsm-popup__close {
-	text-decoration: none !important;
-}
 .qsm-popup__btn-primary {
 	margin-right: 30px;
 }
@@ -273,6 +270,9 @@ footer.qsm-popup__footer button.qsm-popup-secondary-button:hover {
 	display: block;
 	margin-bottom: 10px;
 }
+.qsm-quiz-container .quiz_section .qsm-align-fill-in-blanks:not(.qsm_remove_bold) {
+	display: inline-block;
+}
 .quiz_section iframe {
 	width: 100% !important;
 	min-height: 315px !important;
@@ -428,6 +428,10 @@ body .qsm-results-page .mlw_qmn_question .qmn_image_option:before {
 	display: inline-block;
 	cursor: pointer;
 }
+.qsm-quiz-form .mlw_answer_open_text,
+.qsm-quiz-form  .mlw_answer_number{
+	margin-bottom: 10px;
+}
 @media screen and (max-width: 767px) {
 	.question-type-polar-s .left-polar-title,
 	.question-type-polar-s .slider-main-wrapper,
@@ -547,8 +551,8 @@ body .ui-tooltip.ui-widget-content {
 	border-bottom: 1px solid #808080;
 	padding-bottom: 25px;
 }
-.qmn_btn, 
-.qsm-quiz-container.qmn_quiz_container .qmn_btn, 
+.qmn_btn,
+.qsm-quiz-container.qmn_quiz_container .qmn_btn,
 .qsm-quiz-container.qmn_quiz_container .btn {
 	position: relative;
 	display: inline-block;
diff --git a/css/qsm-admin-question.css b/css/qsm-admin-question.css
index 094e08df0..1a079b0c1 100644
--- a/css/qsm-admin-question.css
+++ b/css/qsm-admin-question.css
@@ -119,7 +119,7 @@
 	min-width: 45%;
 	padding: 8px 15px;
 }
-.page-footer a.button .dashicons, 
+.page-footer a.button .dashicons,
 .new-answer-button a#new-answer-button .dashicons {
 	line-height: 32px;
 }
@@ -134,13 +134,7 @@
 	text-decoration: none;
 }
 .page-header-buttons {
-	display: flex;
-	width: 100%;
-	justify-content: space-around;
-	align-content: center;
-	align-items: center;
-	flex-wrap: wrap;
-	flex-direction: row;
+	text-align: right;
 }
 .question, .question-bank-question {
 	box-sizing: border-box;
diff --git a/css/qsm-admin.css b/css/qsm-admin.css
index 58ecf83d8..e9532d3e9 100644
--- a/css/qsm-admin.css
+++ b/css/qsm-admin.css
@@ -2293,6 +2293,7 @@ input#question_search::-webkit-search-cancel-button {
 	align-items: center;
 	flex-wrap: nowrap;
 	flex-direction: row;
+	max-width: calc(100% - 275px);
 }
 .qsm-quiz-nav-bar .qsm-quiz-heading .qsm_quiz_title {
 	padding: 0;
@@ -3007,3 +3008,17 @@ input#duplicate_questions {
 		font-size: 10px;
 	}
 }
+@media screen and (max-width: 767px) {
+	.qsm-quiz-nav-bar .qsm-quiz-heading{
+		max-width: 100%;
+	}
+	.qsm-quiz-nav-bar .qsm-quiz-top-nav-links{
+		justify-content: flex-end;
+		width: 100%;
+	}
+	.mlw_quiz_options .button-primary{
+		padding: 0px 5px;
+		font-size: 12px;
+		min-height: 35px;
+	}
+}
\ No newline at end of file
diff --git a/js/qsm-admin.js b/js/qsm-admin.js
index 4766a4cdf..501405802 100644
--- a/js/qsm-admin.js
+++ b/js/qsm-admin.js
@@ -1454,6 +1454,7 @@ var QSMContact;
                         'operator': operator,
                         'value': value
                     }));
+                    jQuery(document).trigger('qsm_after_add_email_condition', [$email, category, criteria, operator, value]);
                 },
                 newCondition: function ($email) {
                     QSMAdminEmails.addCondition($email, '', 'score', 'equal', 0);
@@ -1758,7 +1759,7 @@ var import_button;
                     //Create Default pages and one question.
                     if (qsmQuestionSettings.pages.length == 0 && QSMQuestion.questions.length == 0) {
                         $('.new-page-button').trigger('click');
-                        $('.questions .new-question-button').trigger('click');
+                        $('.questions .new-question-button:eq("1")').trigger('click');
                     }
                     QSMQuestion.countTotal();
                 },
@@ -3264,6 +3265,7 @@ var import_button;
                         'operator': operator,
                         'value': value
                     }));
+                    jQuery(document).trigger('qsm_after_add_result_condition', [$page, category, criteria, operator, value]);
                 },
                 newCondition: function ($page) {
                     QSMAdminResults.addCondition($page, '', 'score', 'equal', 0);
diff --git a/js/qsm-quiz.js b/js/qsm-quiz.js
index e289a955d..af44f9784 100644
--- a/js/qsm-quiz.js
+++ b/js/qsm-quiz.js
@@ -787,7 +787,7 @@ function qmnValidation(element, quiz_form_id) {
 	var error_messages = qmn_quiz_data[quiz_id].error_messages;
 	qmnResetError(quiz_form_id);
 	jQuery(element).each(function () {
-		if ( jQuery(this).attr('class') && jQuery(this).is(':visible') ) {
+		if ( jQuery(this).attr('class') && ( jQuery(this).is(':visible') || ( jQuery(this).attr('class').indexOf('mlwRequiredPolar') > -1 && jQuery(this).parent().is(':visible') ) ) ) {
 			if (jQuery(this).attr('class').indexOf('mlwEmail') !== -1 && this.value !== "") {
 				// Remove any trailing and preceeding space.
 				var x = jQuery.trim(this.value);
@@ -1453,42 +1453,62 @@ jQuery(function () {
 		});
 	});
 
-	jQuery(document).on('change', '.qmn_radio_answers input', function (e) {
+	jQuery(document).on('change', '.qmn_radio_answers input' , function (e) {
 		var quizID = jQuery(this).parents('.qsm-quiz-container').find('.qmn_quiz_id').val();
 		if (qmn_quiz_data[quizID].enable_quick_result_mc == 1) {
-			var question_id = jQuery(this).attr('name').split('question')[1],
-				value = jQuery(this).val(),
-				$this = jQuery(this).parents('.quiz_section');
-			jQuery.ajax({
-				type: 'POST',
-				url: qmn_ajax_object.ajaxurl,
-				data: {
-					action: "qsm_get_question_quick_result",
-					question_id: question_id,
-					answer: value,
-					show_correct_info: qmn_quiz_data[quizID].enable_quick_correct_answer_info
-				},
-				success: function (response) {
-					var data = jQuery.parseJSON(response);
-					$this.find('.quick-question-res-p').remove();
-					$this.find('.qsm-inline-correct-info').remove();
-					if (data.success == 'correct') {
-						$this.append('<div style="color: green" class="quick-question-res-p">' + qmn_quiz_data[quizID].quick_result_correct_answer_text + '</div>')
-						$this.append('<div class="qsm-inline-correct-info">' + data.message + '</div>');
-					} else if (data.success == 'incorrect') {
-						$this.append('<div style="color: red" class="quick-question-res-p">' + qmn_quiz_data[quizID].quick_result_wrong_answer_text + '</div>')
-						$this.append('<div class="qsm-inline-correct-info">' + data.message + '</div>');
-					}
-					if (1 != qmn_quiz_data[quizID].disable_mathjax) {
-						MathJax.typesetPromise();
-					}
-				},
-				error: function (errorThrown) {
-					alert(errorThrown);
-				}
-			});
+			let question_id = jQuery(this).attr('name').split('question')[1],
+			value = jQuery(this).val(),
+			$this = jQuery(this).parents('.quiz_section');
+			qsm_show_inline_result(quizID, question_id, value, $this, 'radio')
 		}
 	});
+	let qsm_inline_result_timer;
+	jQuery(document).on('keyup', '.mlw_answer_open_text, .mlw_answer_number', function (e) {
+		let $i_this = jQuery(this);
+		let quizID = jQuery(this).parents('.qsm-quiz-container').find('.qmn_quiz_id').val();
+		if (qmn_quiz_data[quizID].enable_quick_result_mc == 1) {
+			clearTimeout(qsm_inline_result_timer);
+			qsm_inline_result_timer = setTimeout(() => {
+				let question_id = $i_this.attr('name').split('question')[1],
+				value = $i_this.val(),
+				$this = $i_this.parents('.quiz_section');
+				qsm_show_inline_result(quizID, question_id, value, $this, 'input');
+			}, 2000);
+		}
+	});
+
+	//inline result status function
+	function qsm_show_inline_result(quizID, question_id, value, $this, answer_type) {
+		jQuery.ajax({
+			type: 'POST',
+			url: qmn_ajax_object.ajaxurl,
+			data: {
+				action: "qsm_get_question_quick_result",
+				question_id: question_id,
+				answer: value,
+				answer_type: answer_type,
+				show_correct_info: qmn_quiz_data[quizID].enable_quick_correct_answer_info
+			},
+			success: function (response) {
+				var data = jQuery.parseJSON(response);
+				$this.find('.quick-question-res-p').remove();
+				$this.find('.qsm-inline-correct-info').remove();
+				if (data.success == 'correct') {
+					$this.append('<div style="color: green" class="quick-question-res-p">' + qmn_quiz_data[quizID].quick_result_correct_answer_text + '</div>')
+					$this.append('<div class="qsm-inline-correct-info">' + data.message + '</div>');
+				} else if (data.success == 'incorrect') {
+					$this.append('<div style="color: red" class="quick-question-res-p">' + qmn_quiz_data[quizID].quick_result_wrong_answer_text + '</div>')
+					$this.append('<div class="qsm-inline-correct-info">' + data.message + '</div>');
+				}
+				if (1 != qmn_quiz_data[quizID].disable_mathjax) {
+					MathJax.typesetPromise();
+				}
+			},
+			error: function (errorThrown) {
+				alert(errorThrown);
+			}
+		});
+	}
 
 	// Autocomplete off
 	jQuery('.qsm-quiz-container').find('.qmn_quiz_id').each(function () {
diff --git a/mlw_quizmaster2.php b/mlw_quizmaster2.php
index 3d29224be..ff4fb2cfd 100644
--- a/mlw_quizmaster2.php
+++ b/mlw_quizmaster2.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Quiz And Survey Master
  * Description: Easily and quickly add quizzes and surveys to your website.
- * Version: 8.0.10
+ * Version: 8.1.0
  * Author: ExpressTech
  * Author URI: https://quizandsurveymaster.com/
  * Plugin URI: https://expresstech.io/
@@ -43,7 +43,7 @@ class MLWQuizMasterNext {
 	 * @var string
 	 * @since 4.0.0
 	 */
-	public $version = '8.0.10';
+	public $version = '8.1.0';
 
 	/**
 	 * QSM Alert Manager Object
@@ -277,7 +277,7 @@ public function qsm_admin_scripts_style( $hook ) {
 			wp_enqueue_style( 'qsm_admin_style_rtl', plugins_url( 'css/qsm-admin-rtl.css', __FILE__ ), array(), $this->version );
 		}
 		// dashboard and quiz list pages
-		if ( 'toplevel_page_qsm_dashboard' === $hook || ('edit.php' == $hook && isset( $_REQUEST['post_type'] ) && 'qsm_quiz' == $_REQUEST['post_type']) ) {
+		if ( 'toplevel_page_qsm_dashboard' === $hook || 'qsm_page_qmn_addons' === $hook || ('edit.php' == $hook && isset( $_REQUEST['post_type'] ) && 'qsm_quiz' == $_REQUEST['post_type']) ) {
 			wp_enqueue_script( 'micromodal_script', plugins_url( 'js/micromodal.min.js', __FILE__ ), array( 'jquery', 'qsm_admin_js' ), $this->version, true );
 			wp_enqueue_media();
 			wp_enqueue_style( 'qsm_admin_dashboard_css', QSM_PLUGIN_CSS_URL . '/admin-dashboard.css', array(), $this->version );
diff --git a/php/admin/admin-dashboard.php b/php/admin/admin-dashboard.php
index 9d81bf495..0713479d1 100644
--- a/php/admin/admin-dashboard.php
+++ b/php/admin/admin-dashboard.php
@@ -336,7 +336,7 @@ function qsm_dashboard_popular_addon( $widget_id ) {
 	?>
 <div id="<?php echo esc_attr( $widget_id ); ?>" class="postbox <?php qsm_check_close_hidden_box( $widget_id ); ?>">
 	<button type="button" class="handlediv" aria-expanded="true">
-		<span class="screen-reader-text"><?php echo __( 'Toggle panel', 'quiz-master-next' ); ?>:
+		<span class="screen-reader-text"><?php esc_html_e( 'Toggle panel', 'quiz-master-next' ); ?>:
 			<?php esc_html_e( 'Most Popular Extensions', 'quiz-master-next' ); ?></span>
 		<span class="toggle-indicator" aria-hidden="true"></span>
 	</button>
diff --git a/php/admin/functions.php b/php/admin/functions.php
index 95d7ee7ee..04c0c8e31 100644
--- a/php/admin/functions.php
+++ b/php/admin/functions.php
@@ -222,7 +222,8 @@ function qsm_add_author_column_in_db() {
  * Transfer all quiz post to new cpt 'qsm_quiz'
  */
 function qsm_change_the_post_type() {
-	if ( 1 !== intval( get_option( 'qsm_change_the_post_type', '' ) ) ) {
+	$all_plugins = get_plugins();
+	if ( empty( $all_plugins['sensei-lms/sensei-lms.php'] ) && 1 !== intval( get_option( 'qsm_change_the_post_type', '' ) ) ) {
 		$post_arr    = array(
 			'post_type'      => 'quiz',
 			'posts_per_page' => -1,
@@ -796,7 +797,7 @@ class="qsm-opt-desc"><?php esc_html_e( 'Enter a name for this Quiz.', 'quiz-mast
 																</span>
 															</a>
 															<a class="addon-get-link" href="<?php echo esc_url( $link ); ?>" target="_blank" rel="noopener">
-																<?php echo __( 'View Details', 'quiz-master-next' ); ?>
+																<?php esc_html_e( 'View Details', 'quiz-master-next' ); ?>
 															</a>
 														</div>
 														<?php
diff --git a/php/admin/options-page-email-tab.php b/php/admin/options-page-email-tab.php
index ea6b5bcd7..6b8fab623 100644
--- a/php/admin/options-page-email-tab.php
+++ b/php/admin/options-page-email-tab.php
@@ -203,16 +203,17 @@ function qsm_options_emails_tab_template() {
 	<div class="email-condition">
 		<button class="delete-condition-button"><span class="dashicons dashicons-trash"></span></button>
 		<select class="email-condition-category">
-					<option value="" <# if (data.category == '') { #>selected<# } #>><?php esc_html_e( 'Quiz', 'quiz-master-next' ); ?></option>
-					<option value="" disabled><?php esc_html_e( '---Select Category---', 'quiz-master-next' ); ?></option>
-					<?php if ( ! empty( $categories ) ) { ?>
-						<?php foreach ( $categories as $cat ) { ?>
-						<option value="<?php echo esc_attr( $cat[0] ); ?>" <# if (data.category == '<?php echo esc_attr( $cat[0] ); ?>') { #>selected<# } #>><?php echo esc_attr( $cat[0] ); ?></option>
-						<?php } ?>
-					<?php } else { ?>
-						<option value="" disabled><?php esc_html_e( 'No Categories Available', 'quiz-master-next' ); ?></option>
-					<?php } ?>
-				</select>
+			<option value="" <# if (data.category == '') { #>selected<# } #>><?php esc_html_e( 'Quiz', 'quiz-master-next' ); ?></option>
+			<option value="" disabled><?php esc_html_e( '---Select Category---', 'quiz-master-next' ); ?></option>
+			<?php if ( ! empty( $categories ) ) { ?>
+				<?php foreach ( $categories as $cat ) { ?>
+				<option value="<?php echo esc_attr( $cat[0] ); ?>" <# if (data.category == '<?php echo esc_attr( $cat[0] ); ?>') { #>selected<# } #>><?php echo esc_attr( $cat[0] ); ?></option>
+				<?php } ?>
+			<?php } else { ?>
+				<option value="" disabled><?php esc_html_e( 'No Categories Available', 'quiz-master-next' ); ?></option>
+			<?php } ?>
+			<?php do_action( 'qsm_email_page_condition_category' ); ?>
+		</select>
 		<select class="email-condition-criteria">
 			<option value="points" <# if (data.criteria == 'points') { #>selected<# } #>><?php esc_html_e( 'Total points earned', 'quiz-master-next' ); ?></option>
 			<option value="score" <# if (data.criteria == 'score') { #>selected<# } #>><?php esc_html_e( 'Correct score percentage', 'quiz-master-next' ); ?></option>
diff --git a/php/admin/options-page-questions-tab.php b/php/admin/options-page-questions-tab.php
index 47c382eb4..d25500c19 100644
--- a/php/admin/options-page-questions-tab.php
+++ b/php/admin/options-page-questions-tab.php
@@ -1102,12 +1102,16 @@ function qsm_options_questions_tab_template() {
 		<div class="page page-new" data-page-id="{{data.id }}">
 			<div class="page-header">
 				<div><span class="dashicons dashicons-move"></span> <span class="page-number"></span></div>
-				<div><a href="javascript:void(0)" class="edit-page-button" title="Edit Page"><span class="dashicons dashicons-admin-generic"></span></a></div>
+				<div>
+					<a href="javascript:void(0)" class="edit-page-button" title="Edit Page"><span class="dashicons dashicons-admin-generic"></span></a>
+					<a href="javascript:void(0)" class="add-question-bank-button button button-primary"><?php esc_html_e( 'Import', 'quiz-master-next' ); ?></a>
+					<a href="javascript:void(0)" class="new-question-button button button-primary"><?php esc_html_e( 'Add Question', 'quiz-master-next' ); ?></a>
+				</div>
 			</div>
 			<div class="page-footer">
 				<div class="page-header-buttons">
-					<a href="javascript:void(0)" class="add-question-bank-button qsm-dashed-btn"><span class="dashicons dashicons-plus"></span> <?php esc_html_e( 'Add Question From Question Bank', 'quiz-master-next' ); ?></a>
-					<a href="javascript:void(0)" class="new-question-button qsm-dashed-btn"><span class="dashicons dashicons-plus"></span> <?php esc_html_e( 'Create New Question', 'quiz-master-next' ); ?></a>
+					<a href="javascript:void(0)" class="add-question-bank-button button button-primary"><?php esc_html_e( 'Import', 'quiz-master-next' ); ?></a>
+					<a href="javascript:void(0)" class="new-question-button button button-primary"><?php esc_html_e( 'Add Question', 'quiz-master-next' ); ?></a>
 				</div>
 			</div>
 		</div>
diff --git a/php/admin/options-page-results-page-tab.php b/php/admin/options-page-results-page-tab.php
index 69f0354cc..916478f4c 100644
--- a/php/admin/options-page-results-page-tab.php
+++ b/php/admin/options-page-results-page-tab.php
@@ -120,25 +120,25 @@ function qsm_options_results_tab_content() {
 								$upgrade_link = qsm_get_plugin_link('extra-template-variables');
 								$classname = "qsm-upgrade-popup-variable";
 								$qsm_badge = "<a  href =".$upgrade_link." target='_blank' class='qsm-upgrade-popup-badge'>".esc_html__( 'PRO', 'quiz-master-next' )."</a>";
-						
+
 							}
 							if ( ( ! class_exists( 'Mlw_Qmn_Al_Widget' ) ) && ( 'Advanced Leaderboard' == $category_name ) ) {
 								$upgrade_link = qsm_get_plugin_link('downloads/advanced-leaderboard/');
 								$classname = "qsm-upgrade-popup-variable";
 								$qsm_badge = "<a  href =".$upgrade_link." target='_blank' class='qsm-upgrade-popup-badge'>".esc_html__( 'PRO', 'quiz-master-next' )."</a>";
-							
+
 							}
 							if ( ( ! class_exists( 'QSM_Exporting' ) ) && ( 'Export Results' == $category_name) ) {
 								$upgrade_link = qsm_get_plugin_link('downloads/export-results/');
 								$classname = "qsm-upgrade-popup-variable";
 								$qsm_badge = "<a  href =".$upgrade_link." target='_blank' class='qsm-upgrade-popup-badge'>".esc_html__( 'PRO', 'quiz-master-next' )."</a>";
-						
+
 							}
 							if ( ( ! class_exists( 'QSM_Analysis' ) ) && ( 'Analysis' == $category_name ) ) {
 								$upgrade_link = qsm_get_plugin_link('downloads/results-analysis/');
 								$classname = "qsm-upgrade-popup-variable";
 								$qsm_badge = "<a  href =".$upgrade_link." target='_blank' class='qsm-upgrade-popup-badge'>".esc_html__( 'PRO', 'quiz-master-next' )."</a>";
-							
+
 							}
 							?>
 							<div><h2 class="qsm-upgrade-popup-category-name"><?php echo esc_attr( $category_name );?></h2><?php echo  wp_kses_post( $qsm_badge ) ; ?></div>
@@ -237,6 +237,7 @@ function qsm_options_results_tab_template(){
 					<?php } else { ?>
 						<option value="" disabled><?php esc_html_e( 'No Categories Available', 'quiz-master-next' ); ?></option>
 					<?php } ?>
+					<?php do_action( 'qsm_results_page_condition_category' ); ?>
 				</select>
 
 				<select class="results-page-condition-criteria">
diff --git a/php/admin/quiz-options-page.php b/php/admin/quiz-options-page.php
index b8c6cc514..c6a4c8655 100644
--- a/php/admin/quiz-options-page.php
+++ b/php/admin/quiz-options-page.php
@@ -213,6 +213,9 @@ function qsm_generate_quiz_options() {
 						</div>
 						<?php
 					}
+					if ( class_exists( 'QSM_Export_Import' ) ) {
+						?><a class="button button-primary" href="<?php echo esc_url( admin_url() . 'admin.php?page=qmn_addons&tab=export-and-import' ); ?>" style="float: right;" target="_blank" rel="noopener"><?php esc_html_e( 'Import & Export', 'quiz-master-next' ); ?></a><?php
+					}
 					?>
 				</nav>
 				<div class="qsm_tab_content">
diff --git a/php/admin/settings-page.php b/php/admin/settings-page.php
index f6951d2b3..b2b3f5cec 100644
--- a/php/admin/settings-page.php
+++ b/php/admin/settings-page.php
@@ -185,6 +185,7 @@ public function quiz_default_global_option_init() {
 		add_settings_field( 'disable-auto-fill-for-contact-input', __( 'Disable auto fill for contact input', 'quiz-master-next' ), array( $this, 'qsm_global_disable_auto_fill_for_contact_input' ), 'qsm_default_global_option_contact', 'qmn-global-section' );
 		add_settings_field( 'disable-auto-fill-for-quiz-input', __( 'Disable auto fill for Quiz input', 'quiz-master-next' ), array( $this, 'qsm_global_disable_auto_fill_for_quiz_input' ), 'qsm_default_global_option_display', 'qmn-global-section' );
 		add_settings_field( 'display-category-name-on-front-end', __( 'Display category name on front end', 'quiz-master-next' ), array( $this, 'qsm_global_display_category_name_on_front_end' ), 'qsm_default_global_option_display', 'qmn-global-section' );
+		add_settings_field( 'hide-correct-answer', __( 'Hide Correct Answer', 'quiz-master-next' ), array( $this, 'qsm_global_hide_correct_answer' ), 'qsm_default_global_option_display', 'qmn-global-section' );
 		add_settings_field( 'show-results-inline', __( 'Show results inline', 'quiz-master-next' ), array( $this, 'qsm_global_show_results_inline' ), 'qsm_default_global_option_display', 'qmn-global-section' );
 		add_settings_field( 'end-quiz-if-there-is-wrong-answer', __( 'End quiz if there is wrong answer', 'quiz-master-next' ), array( $this, 'qsm_global_end_quiz_if_there_is_wrong_answer' ), 'qsm_default_global_option_quiz_submission', 'qmn-global-section' );
 		add_settings_field( 'show-correct-answer-inline', __( 'Show correct answer inline', 'quiz-master-next' ), array( $this, 'qsm_global_show_correct_answer_inline' ), 'qsm_default_global_option_display', 'qmn-global-section' );
@@ -1009,6 +1010,24 @@ public function qsm_global_show_results_inline() {
 			<span class="qsm-opt-desc">Instantly displays the result for each question</span>';
 	}
 
+	/**
+	 * Generates Quiz Global  Field For Hide Correct Answer
+	 *
+	 * @since 8.1.0
+	 * @return void
+	 */
+	public function qsm_global_hide_correct_answer() {
+		global $globalQuizsetting;
+		$qsm_hide_correct_answer = ( isset( $globalQuizsetting['hide_correct_answer'] ) && '' !== $globalQuizsetting['hide_correct_answer'] ? $globalQuizsetting['hide_correct_answer'] : '0' );
+		echo '<fieldset class="buttonset buttonset-hide" >
+				<input type="radio" id="hide_correct_answer-1" name="qsm-quiz-settings[hide_correct_answer]" value="1" ' . checked( $qsm_hide_correct_answer, '1', false ) . '>
+				<label for="hide_correct_answer-1">Yes</label><br>
+				<input type="radio" id="hide_correct_answer-0" name="qsm-quiz-settings[hide_correct_answer]" value="0" ' . checked( $qsm_hide_correct_answer, '0', false ) . '>
+				<label for="hide_correct_answer-0">No</label><br>
+			 </fieldset>
+			<span class="qsm-opt-desc">Hide correct answer on result page if user selected wrong answer from quiz.</span>';
+	}
+
 	/**
 	 * Generates Quiz Global  Field For End quiz if there is wrong answer
 	 *
diff --git a/php/admin/tools-page.php b/php/admin/tools-page.php
index 96c71cc2f..1ad37ae24 100644
--- a/php/admin/tools-page.php
+++ b/php/admin/tools-page.php
@@ -46,7 +46,7 @@ function qsm_restore_function() {
 	global $wpdb;
 
 	// Checks if form was submitted.
-	if ( isset( $_POST['restore_quiz'] ) ) {
+	if ( isset( $_POST['restore_quiz_nonce'] ) && wp_verify_nonce( sanitize_text_field( wp_unslash( $_POST['restore_quiz_nonce'] ) ), 'restore_quiz_nonce' ) && isset( $_POST['restore_quiz'] ) ) {
 		$restore = $wpdb->update(
 			$wpdb->prefix . 'mlw_quizzes',
 			array(
@@ -88,7 +88,7 @@ function qsm_restore_function() {
 			}
 			wp_reset_postdata();
 			?>
-			<span style="color:red;"><?php esc_html_e( 'Quiz Has Been Restored!', 'quiz-master-next' ); ?></span>
+			<span style="color:green;"><?php esc_html_e( 'Quiz Has Been Restored!', 'quiz-master-next' ); ?></span>
 			<?php
 		}
 	}
@@ -96,6 +96,7 @@ function qsm_restore_function() {
 	?>
 	<h3><?php esc_html_e( 'Choose a quiz in the drop down and then click the button to restore a deleted quiz.', 'quiz-master-next' ); ?></h3>
 	<form action='' method="post">
+		<?php wp_nonce_field( 'restore_quiz_nonce', 'restore_quiz_nonce' ); ?>
 		<select name="restore_quiz">
 			<?php
 			foreach ( $quizzes as $quiz ) {
diff --git a/php/classes/class-qmn-plugin-helper.php b/php/classes/class-qmn-plugin-helper.php
index 1b7a9ccc9..39572d44b 100644
--- a/php/classes/class-qmn-plugin-helper.php
+++ b/php/classes/class-qmn-plugin-helper.php
@@ -1096,13 +1096,17 @@ function qsm_convert_question_array_date_format( $questions ) {
 	 */
 
 	public function qsm_results_css_inliner( $html ) {
+		
+		global $mlwQuizMasterNext;
+		$grading = $mlwQuizMasterNext->pluginHelper->get_section_setting( 'quiz_options', 'system' );
+		$wr_sign = 1 != $grading ? "&#x2715;&nbsp;" : "";
 
 		$html    = str_replace( '<br/>', '<br>', $html );
 		$html    = str_replace( '<br />', '<br>', $html );
 		$html    = str_replace( "class='qmn_question_answer", "style='margin-bottom:30px' class='", $html );
 		$html    = preg_replace( '/<span class="qsm-text-simple-option(.*?)">(.*?)<\/span>/', "<span style='color:#808080;display:block;margin-bottom:5px;'>&#8226;&nbsp;$2</span>", $html );
 		$html    = preg_replace( '/<span class="qsm-text-wrong-option(.*?)">(.*?)<\/span>/', "<span style='color:red;display:block;margin-bottom:5px;'>&#x2715;&nbsp;$2</span>", $html );
-		$html    = preg_replace( '/<span class="qmn_user_incorrect_answer(.*?)">(.*?)<\/span>/', "<span style='color:red;display:block;margin-bottom:5px;'>&#x2715;&nbsp;$2</span>", $html );
+		$html    = preg_replace( '/<span class="qmn_user_incorrect_answer(.*?)">(.*?)<\/span>/', "<span style='color:red;display:block;margin-bottom:5px;'>".$wr_sign."$2</span>", $html );
 		$html    = preg_replace( '/<span class="qsm-text-correct-option(.*?)">(.*?)<\/span>/', "<span style='color:green;display:block;margin-bottom:5px;'>&#10003;&nbsp;$2</span>", $html );
 		$html    = preg_replace( '/<span class="qmn_user_correct_answer(.*?)">(.*?)<\/span>/', "<span style='color:green;display:block;margin-bottom:5px;'>&#10003;&nbsp;$2</span>", $html );
 
diff --git a/php/classes/class-qmn-quiz-manager.php b/php/classes/class-qmn-quiz-manager.php
index 78a79e6ef..29e1a8eaa 100644
--- a/php/classes/class-qmn-quiz-manager.php
+++ b/php/classes/class-qmn-quiz-manager.php
@@ -220,6 +220,7 @@ public function qsm_get_question_quick_result() {
 		global $wpdb, $mlwQuizMasterNext;
 		$question_id       = isset( $_POST['question_id'] ) ? intval( $_POST['question_id'] ) : 0;
 		$answer            = isset( $_POST['answer'] ) ? sanitize_text_field( wp_unslash( $_POST['answer'] ) ) : '';
+		$answer_type       = isset( $_POST['answer_type'] ) ? sanitize_text_field( wp_unslash( $_POST['answer_type'] ) ) : '';
 		$question_array    = $wpdb->get_row( $wpdb->prepare( "SELECT answer_array, question_answer_info FROM {$wpdb->prefix}mlw_questions WHERE question_id = (%d)", $question_id ), 'ARRAY_A' );
 		$answer_array      = maybe_unserialize( $question_array['answer_array'] );
 		$correct_info_text = isset( $question_array['question_answer_info'] ) ? html_entity_decode( $question_array['question_answer_info'] ) : '';
@@ -230,10 +231,18 @@ public function qsm_get_question_quick_result() {
 		$correct_answer    = false;
 		if ( $answer_array && false === $got_ans ) {
 			foreach ( $answer_array as $key => $value ) {
-				if ( intval( $answer ) === $key && 1 === intval( $value[2] ) ) {
-					$got_ans        = true;
-					$correct_answer = true;
-					break;
+				if ( 'input' === $answer_type ) {
+					if ( $answer == $value[0] && 1 === intval( $value[2] ) ) {
+						$got_ans        = true;
+						$correct_answer = true;
+						break;
+					}
+				}else {
+					if ( intval( $answer ) === $key && 1 === intval( $value[2] ) ) {
+						$got_ans        = true;
+						$correct_answer = true;
+						break;
+					}
 				}
 			}
 		}
diff --git a/php/classes/class-qsm-install.php b/php/classes/class-qsm-install.php
index 575ca9bf6..437e7e294 100644
--- a/php/classes/class-qsm-install.php
+++ b/php/classes/class-qsm-install.php
@@ -664,6 +664,27 @@ public function register_default_settings() {
 			'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' );
 
 		$field_array = array(
 			'id'         => 'end_quiz_if_wrong',
diff --git a/php/question-types/qsm-question-title.php b/php/question-types/qsm-question-title.php
index 7ca29093c..95a05dc8a 100644
--- a/php/question-types/qsm-question-title.php
+++ b/php/question-types/qsm-question-title.php
@@ -8,9 +8,12 @@ function qsm_question_title_func( $question, $question_type = '', $new_question_
 	global $wp_embed, $mlwQuizMasterNext;
 	$question_title    = $wp_embed->run_shortcode( $question_title );
 	$question_title    = preg_replace( '/\s*[a-zA-Z\/\/:\.]*youtube.com\/watch\?v=([a-zA-Z0-9\-_]+)([a-zA-Z0-9\/\*\-\_\?\&\;\%\=\.]*)/i', '<iframe width="420" height="315" src="//www.youtube.com/embed/$1" frameborder="0" allowfullscreen></iframe>', $question_title );
-	$polar_extra_class = '';
+	$title_extra_classes = '';
 	if ( 'polar' === $question_type ) {
-		$polar_extra_class = 'question-type-polar-s';
+		$title_extra_classes .= ' question-type-polar-s';
+	}
+	if ( 'fill_in_blank' === $question_type ) {
+		$title_extra_classes .= ' qsm-align-fill-in-blanks';
 	}
 	$qmn_quiz_options = $mlwQuizMasterNext->quiz_settings->get_quiz_options();
 	$deselect_answer  = '';
@@ -18,6 +21,13 @@ function qsm_question_title_func( $question, $question_type = '', $new_question_
 		$deselect_answer = '<a href="javascript:void(0)" class="qsm-deselect-answer">'.__( 'Deselect Answer', 'quiz-master-next' ).'</a>';
 	}
 
+	if ( '' !== $new_question_title ) {
+		$new_question_title = $mlwQuizMasterNext->pluginHelper->qsm_language_support( htmlspecialchars_decode( $new_question_title, ENT_QUOTES ), "Question-{$question_id}", "QSM Questions");
+		?>
+		<div class='mlw_qmn_new_question'><?php echo esc_html( $new_question_title ); ?> </div>
+		<?php
+		$title_extra_classes .= ' qsm_remove_bold';
+	}
 	if ( $question_id ) {
 		$featureImageID = $mlwQuizMasterNext->pluginHelper->get_question_setting( $question_id, 'featureImageID' );
 		if ( $featureImageID ) {
@@ -26,18 +36,11 @@ function qsm_question_title_func( $question, $question_type = '', $new_question_
 			<?php
 		}
 	}
-	if ( '' !== $new_question_title ) {
-		$new_question_title = $mlwQuizMasterNext->pluginHelper->qsm_language_support( htmlspecialchars_decode( $new_question_title, ENT_QUOTES ), "Question-{$question_id}", "QSM Questions");
-		?>
-		<div class='mlw_qmn_new_question'><?php echo esc_html( $new_question_title ); ?> </div>
-		<?php
-		$polar_extra_class .= ' qsm_remove_bold';
-	}
 	if ( ! empty( $question_title ) ) {
 		$question_title = $mlwQuizMasterNext->pluginHelper->qsm_language_support( htmlspecialchars_decode( $question_title, ENT_QUOTES ), "question-description-{$question_id}", "QSM Questions" );
 	}
 	?>
-	<div class='mlw_qmn_question <?php echo esc_attr( $polar_extra_class ); ?>' >
+	<div class='mlw_qmn_question <?php echo esc_attr( $title_extra_classes ); ?>' >
 	<?php do_action('qsm_before_question_title',$question, $question_type, $new_question_title, $question_id );
 		$allow_html = wp_kses_allowed_html('post');
 		$allow_html['input']['autocomplete'] = 1;
diff --git a/php/question-types/qsm-question-type-fill-in-the-blanks.php b/php/question-types/qsm-question-type-fill-in-the-blanks.php
index fff4b9aae..a130b751e 100644
--- a/php/question-types/qsm-question-type-fill-in-the-blanks.php
+++ b/php/question-types/qsm-question-type-fill-in-the-blanks.php
@@ -49,7 +49,7 @@ function qmn_fill_blank_display( $id, $question, $answers ) {
 	}
 	// $question_title = apply_filters('the_content', $question);
 	$new_question_title = $mlwQuizMasterNext->pluginHelper->get_question_setting( $id, 'question_title' );
-	qsm_question_title_func( $question, '', $new_question_title, $id );
+	qsm_question_title_func( $question, 'fill_in_blank', $new_question_title, $id );
 	echo apply_filters( 'qmn_fill_blank_display_front', '', $id, $question, $answers );
 }
 
diff --git a/php/question-types/qsm-question-type-polar.php b/php/question-types/qsm-question-type-polar.php
index 8606b5eca..5beb666fb 100644
--- a/php/question-types/qsm-question-type-polar.php
+++ b/php/question-types/qsm-question-type-polar.php
@@ -35,7 +35,7 @@ function qmn_polar_display( $id, $question, $answers ) {
 	$slider_data_atts .= ' data-is_reverse=' . intval( $is_reverse ) . ' ';
 	$slider_data_atts .= ' data-is_required=' . $required . ' ';
 	if ( 0 == $required ) {
-		$mlw_require_class = 'mlwRequiredText';
+		$mlw_require_class = 'mlwRequiredText mlwRequiredPolar';
 	} else {
 		$mlw_require_class = '';
 	}
diff --git a/php/template-variables.php b/php/template-variables.php
index 6f5089040..de1c811b3 100644
--- a/php/template-variables.php
+++ b/php/template-variables.php
@@ -1056,7 +1056,7 @@ function qsm_questions_answers_shortcode_to_text( $mlw_quiz_array, $qmn_question
 						if ( 0 == $form_type && ( 0 == $quiz_system || 3 == $quiz_system ) ) {
 							if ( isset( $single_answer[2] ) && 1 == $single_answer[2] ) {
 								if ( 5 == $answer['question_type'] ) {
-									$user_given_answer   = trim( str_replace( ' ', '', preg_replace( '/\s\s+/', '', $user_given_answer ) ) );
+									$user_given_answer   = htmlentities( $answer[1] );
 									$current_answer_zero = trim( str_replace( ' ', '', preg_replace( '/\s\s+/', '', $current_answer_zero ) ) );
 								}
 
@@ -1078,7 +1078,8 @@ function qsm_questions_answers_shortcode_to_text( $mlw_quiz_array, $qmn_question
 						if ( 0 == $form_type && ( 0 == $quiz_system || 3 == $quiz_system ) ) {
 							$question_with_answer_text .= '<span class="qsm-text-wrong-option">' . $user_given_answer . '</span>';
 							foreach ( $total_answers as $single_answer ) {
-								if ( isset( $single_answer[2] ) && 1 == $single_answer[2] ) {
+								$hide_correct_answer = $mlwQuizMasterNext->pluginHelper->get_section_setting( 'quiz_options', 'hide_correct_answer' );
+								if ( isset( $single_answer[2] ) && 1 == $single_answer[2] && 1 != $hide_correct_answer ) {
 									$question_with_answer_text .= '<span class="qsm-text-correct-option">' . $mlwQuizMasterNext->pluginHelper->qsm_language_support( $single_answer[0], 'answer-' . $single_answer[0], 'QSM Answers' ) . '</span>';
 									break;
 								}
diff --git a/php/template-variables/qsm-tempvar-question-answers.php b/php/template-variables/qsm-tempvar-question-answers.php
index 64f903f13..1aefae0d6 100644
--- a/php/template-variables/qsm-tempvar-question-answers.php
+++ b/php/template-variables/qsm-tempvar-question-answers.php
@@ -38,9 +38,10 @@ function qsm_tempvar_qa_text_qt_choice( $total_answers, $answers_from_response,
 		}
 		$close_span = '</span>';
 		if ( 0 == $form_type && ( 0 === intval( $grading_system ) || 3 === intval( $grading_system ) ) ) {
+			$hide_correct_answer = $mlwQuizMasterNext->pluginHelper->get_section_setting( 'quiz_options', 'hide_correct_answer' );
 			if ( $is_user_answer && $is_answer_correct ) {
 				$question_with_answer_text .= '<span class="qsm-text-correct-option qsm-text-user-correct-answer ' .  $class . ' ' . $image_class . '">' . $show_user_answer .$caption.$close_span;
-			} elseif ( ! $is_user_answer && $is_answer_correct ) {
+			} elseif ( ! $is_user_answer && $is_answer_correct && 1 != $hide_correct_answer ) {
 				$question_with_answer_text .= '<span class="qsm-text-correct-option ' .  $class . ' ' . $image_class . '">' . $show_user_answer .$caption.$close_span;
 			} elseif ( $is_user_answer && ! $is_answer_correct ) {
 				$question_with_answer_text .= '<span class="qsm-text-wrong-option ' .  $class . ' ' . $image_class . '">' . $show_user_answer .$caption.$close_span;
diff --git a/readme.txt b/readme.txt
index 1a1bd3c0d..bc9c58ed2 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: quiz, survey, lead, test, score, exam, questionnaire, question,wordpress q
 Requires at least: 4.9
 Tested up to: 6.1
 Requires PHP: 5.4
-Stable tag: 8.0.10
+Stable tag: 8.1.0
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -163,12 +163,18 @@ This is usually a theme conflict. You can [checkout out our common conflict solu
 18. Database
 
 == Changelog ==
+= 8.1.0 (Feb 27, 2023) =
+* Feature: Added a new feature that allows users to show or hide correct answers on the result page
+* Bug: Fixed a bug that caused issues with the required field for the polar question type
+* Bug: Fixed security and vulnerability issues that were identified in the plugin
+* Bug: Fixed a bug that caused issues with displaying results inline for the short answer type
+* Enhancement: Improved user interface for editor
+
 = 8.0.10 (Feb 02, 2023) =
 * Feature: Added option to set theme color transparency
 * Bug: Fixed issue with %TIMER_MINUTES% variable
 * Bug: Fixed issue with duplicate question position
 
-
 = 8.0.9 (Jan 25, 2023) =
 * Feature: Added option to move a question on specified page/position
 * Feature: Added image answer type support for horizontal multiple response questions
diff --git a/templates/qmn_primary.css b/templates/qmn_primary.css
index 51547b886..94f2d6507 100644
--- a/templates/qmn_primary.css
+++ b/templates/qmn_primary.css
@@ -337,7 +337,7 @@ label.inline .mlw_qmn_question,
 
 .qsm-quiz-form .qmn_error .qmn_radio_answers,
 .qsm-quiz-form .qmn_error .qmn_check_answers,
-.qsm-quiz-form .qmn_error .qmn_accept_answers {
+.qsm-quiz-form .qmn_error .qmn_accept_answers{
   border: 1px solid #da4f49;
   background: #F2DEDE;
   padding: 5px;