diff --git a/css/qsm-admin.css b/css/qsm-admin.css
index 1d27114bc..ddf02d078 100644
--- a/css/qsm-admin.css
+++ b/css/qsm-admin.css
@@ -1354,6 +1354,10 @@ tr .qsm-opt-desc {
     font-size: 14px;
 	font-weight: 400;
 }
+.qsm-image-input{
+	margin-right: 5px;
+    margin-top: 5px;
+}
 .form-table .send_email .qsm-opt-tr, .form-table .send_email td {
 	padding-top: 0;
 }
@@ -3311,6 +3315,16 @@ body .qsm_tab_content .qsm-small-input-field input[type="text"] {
     padding: 3px 10px;
     min-width: 100px;
     background-color: #fff;
+	width: 157px;
+}
+.qsm-option-label input:disabled {
+    border-color: #3c434a;
+}
+.qsm-category-list-row td {
+    padding-top: 0;
+}
+.qsm-question-limit-row td{
+	padding-bottom: 0;
 }
 .qsm-quiz-dates fieldset#scheduled_time_start, .qsm-quiz-dates fieldset#scheduled_time_end {
     display: inline-block;
diff --git a/js/qsm-admin.js b/js/qsm-admin.js
index f5e773fba..198f566ae 100644
--- a/js/qsm-admin.js
+++ b/js/qsm-admin.js
@@ -138,7 +138,6 @@ var QSMAdmin;
         });
 
         $(document).on('change', '#limit_category_checkbox-1', function (event) {
-            event.preventDefault();
             if (jQuery('#limit_category_checkbox-1:checked').length > 0) {
                 jQuery('#question_per_category').hide();
                 jQuery('div.select-category-question-limit-maindiv').parents("tr").show();
@@ -146,7 +145,16 @@ var QSMAdmin;
             } else {
                 jQuery('div.select-category-question-limit-maindiv').parents("tr").hide();
                 jQuery('#question_per_category').show();
+                if ( 0 < jQuery('#question_per_category-input').val() ) {
+                    jQuery('.category_selection_random').parents("tr").show();
+                }
+            }
+        });
+        $(document).on('change', '#question_per_category-input', function (event) {
+            if ( 0 < jQuery('#question_per_category-input').val() ) {
                 jQuery('.category_selection_random').parents("tr").show();
+            } else {
+                jQuery('.category_selection_random').parents("tr").hide();
             }
         });
         show_hide_show_correct_answer();
@@ -361,37 +369,29 @@ var QSMAdmin;
                 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();
-        }
-        if (jQuery('#limit_category_checkbox-1:checked').length > 0) {
-            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('.category_selection_random').parents("tr").show();
-            jQuery('#question_per_category').show();
-        }
         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 label, #question_per_category').css('opacity', '1');
                 jQuery('#limit_category_checkbox-1').attr('disabled', false);
-                if (!jQuery('#limit_category_checkbox-1:checked').length) {
-                    jQuery('#question_per_category').show();
-                }
             } else {
-                jQuery('#limit_category_checkbox label').css('opacity', '0.7');
+                jQuery('#limit_category_checkbox label,  #question_per_category').css('opacity', '0.7');
                 jQuery('#limit_category_checkbox-1').attr('disabled', true);
-                jQuery('#question_per_category').hide();
+                jQuery('#question_per_category-input').val(0);
+                jQuery('.category_selection_random').parents("tr").hide();
             }
         });
+        if ( 0 != jQuery('#question_from_total-input').val() ) {
+            jQuery('#limit_category_checkbox label, #question_per_category').css('opacity', '1');
+            jQuery('#limit_category_checkbox-1').attr('disabled', false);
+        } else {
+            jQuery('#limit_category_checkbox label,  #question_per_category').css('opacity', '0.7');
+            jQuery('#limit_category_checkbox-1').attr('disabled', true);
+            jQuery('#question_per_category-input').val(0);
+            jQuery('.category_selection_random').parents("tr").hide();
+        }
+        if ( !jQuery('.category_selection_random').length ) {
+            jQuery('#limit_category_checkbox,  #question_per_category').hide();
+        }
         //Hide/show tr based on selection
         $('.qsm_tab_content .qsm-opt-tr select').each(function () {
             var name = $(this).attr('name');
@@ -400,22 +400,8 @@ var QSMAdmin;
                 $('.' + name + '_' + value).show();
             }
         });
-        $(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 value = $(this).val();
-            hide_show_quiz_options(value);
-        });
-
-        // form_type (0, 1, 2).
-        function hide_show_quiz_options(form_type) {
-            if (0 == form_type) {
-                $('#correct_answer_logic').show();
-            } else {
-                $('#correct_answer_logic').hide();
-            }
-        }
 
         $(document).ready(function () {
-            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});
             }
diff --git a/php/admin/settings-page.php b/php/admin/settings-page.php
index bdba0e8c1..9709680fe 100644
--- a/php/admin/settings-page.php
+++ b/php/admin/settings-page.php
@@ -793,7 +793,7 @@ public function correct_answer_logic(){
 			</label>
 			<label class="qsm-option-label" for="qsm-disable-mathjax">
 				<input type="checkbox" id="qsm-disable-mathjax" name="qsm-quiz-settings[disable_mathjax]" value="1" <?php checked( $qsm_disable_mathjax, 1 ); ?>>
-				<?php esc_html_e( 'Allow entering math formulas in questions, using TeX and LaTeX notation.', 'quiz-master-next' ); ?>
+				<?php esc_html_e( 'Disable entering math formulas in questions, using TeX and LaTeX notation.', 'quiz-master-next' ); ?>
 			</label>
 		</fieldset>
 		<?php
@@ -1102,7 +1102,7 @@ public function qsm_global_questions_per_page() {
 			<?php esc_html_e('Show ', 'quiz-master-next'); ?>
 			<input class="small-text" type="number" placeholder="<?php esc_html_e('Set Limit', 'quiz-master-next'); ?>" step="1" min="0" name="qsm-quiz-settings[pagination]" value="<?php echo esc_attr( $qsm_pagination ); ?>">
 			<?php esc_html_e('Questions Per Page', 'quiz-master-next'); ?>
-			<label class="qsm-opt-desc"><?php esc_html_e('Setting a limit overrides the quiz questions default pagination. Set it to 0 or blank for default pagination.', 'quiz-master-next'); ?></label>
+			<label class="qsm-opt-desc"><i><?php esc_html_e('Setting a limit overrides the quiz questions default pagination. Set it to 0 or blank for default pagination.', 'quiz-master-next'); ?></i></label>
 		</fieldset>
 		<fieldset class="buttonset buttonset-hide" data-hide="1">
 			<label class="qsm-option-label" for="qsm-question-numbering">
@@ -1176,6 +1176,7 @@ public function qsm_global_quiz_animation() {
 		$qsm_quiz_animation = ( isset( $globalQuizsetting['quiz_animation'] ) && '' !== $globalQuizsetting['quiz_animation'] ? $globalQuizsetting['quiz_animation'] : '' );
 		$options            = $mlwQuizMasterNext->pluginHelper->quiz_animation_effect();
 		$qsm_enable_pagination_quiz = ( isset( $globalQuizsetting['enable_pagination_quiz'] ) && '' !== $globalQuizsetting['enable_pagination_quiz'] ? $globalQuizsetting['enable_pagination_quiz'] : 0 );
+		$qsm_disable_scroll_next_previous_click = ( isset( $globalQuizsetting['disable_scroll_next_previous_click'] ) && '' !== $globalQuizsetting['disable_scroll_next_previous_click'] ? $globalQuizsetting['disable_scroll_next_previous_click'] : 0 );
 		?>
 		<select name="qsm-quiz-settings[quiz_animation]">
 		<?php foreach ( $options as $value ) { ?>
@@ -1188,6 +1189,12 @@ public function qsm_global_quiz_animation() {
 				<?php esc_html_e('Display current page number of the quiz', 'quiz-master-next'); ?>
 			</label>
 		</fieldset>
+		<fieldset class="buttonset buttonset-hide" data-hide="1">
+			<label class="qsm-option-label" for="qsm-disable-scroll-next-previous-click">
+				<input type="checkbox" id="qsm-disable-scroll-next-previous-click" name="qsm-quiz-settings[disable_scroll_next_previous_click]" <?php checked( $qsm_disable_scroll_next_previous_click, 1 ); ?> value="1">
+				<?php esc_html_e('Do not scroll the page on clicking next/previous buttons', 'quiz-master-next'); ?>
+			</label>
+		</fieldset>
 		<?php
 	}
 	/**
@@ -1200,16 +1207,15 @@ public function qsm_global_logo_url() {
 		global $globalQuizsetting;
 		$qsm_result_page_fb_image = ( isset( $globalQuizsetting['result_page_fb_image'] ) && '' !== $globalQuizsetting['result_page_fb_image'] ? $globalQuizsetting['result_page_fb_image'] : QSM_PLUGIN_URL . 'assets/icon-200x200.png' );
 		$qsm_ajax_show_correct = ( isset( $globalQuizsetting['ajax_show_correct'] ) && '' !== $globalQuizsetting['ajax_show_correct'] ? $globalQuizsetting['ajax_show_correct'] : 0 );
-		$qsm_disable_scroll_next_previous_click = ( isset( $globalQuizsetting['disable_scroll_next_previous_click'] ) && '' !== $globalQuizsetting['disable_scroll_next_previous_click'] ? $globalQuizsetting['disable_scroll_next_previous_click'] : 0 );
 		$preferred_date_format = ( isset( $globalQuizsetting['preferred_date_format'] ) ? $globalQuizsetting['preferred_date_format'] : get_option( 'date_format' ) );
 		?>
 		<fieldset class="buttonset buttonset-hide" data-hide="1">
-			<span><?php esc_html_e('Set a logo for Facebook sharing', 'quiz-master-next'); ?></span>
+			<span><strong><?php esc_html_e('Set a logo for Facebook sharing', 'quiz-master-next'); ?></strong></span>
 			<div class="qsm-image-field">
 				<input type="text" class="qsm-image-input" name="qsm-quiz-settings[result_page_fb_image]" value="<?php echo esc_url( $qsm_result_page_fb_image ); ?>">
 				<a class="qsm-image-btn button"><span class="dashicons dashicons-format-image"></span><?php esc_html_e('Select Logo', 'quiz-master-next'); ?></a>
 			</div>
-			<label><small class="qsm-font-light"><?php esc_html_e('This logo will be used for Facebook sharing. If left blank, QSM\'s logo will appear.', 'quiz-master-next'); ?></small></label>
+			<label class="qsm-font-light"><i><?php esc_html_e('This logo will be used for Facebook sharing. If left blank, QSM\'s logo will appear.', 'quiz-master-next'); ?></i></label>
 		</fieldset>
 		<fieldset class="buttonset buttonset-hide" data-hide="1">
 			<label class="qsm-option-label" for="qsm-ajax-show-correct">
@@ -1217,12 +1223,6 @@ public function qsm_global_logo_url() {
 				<?php esc_html_e('Add class for correct/incorrect answers', 'quiz-master-next'); ?>
 			</label>
 		</fieldset>
-		<fieldset class="buttonset buttonset-hide" data-hide="1">
-			<label class="qsm-option-label" for="qsm-disable-scroll-next-previous-click">
-				<input type="checkbox" id="qsm-disable-scroll-next-previous-click" name="qsm-quiz-settings[disable_scroll_next_previous_click]" <?php checked( $qsm_disable_scroll_next_previous_click, 1 ); ?> value="1">
-				<?php esc_html_e('Do not scroll the page on clicking next/previous buttons', 'quiz-master-next'); ?>
-			</label>
-		</fieldset>
 		<fieldset class="buttonset buttonset-hide" data-hide="1" id="preferred_date_format">
 			<label class="qsm-option-label" for="qsm-preferred-date-format-1">
 				<input type="radio" id="qsm-preferred-date-format-1" name="qsm-quiz-settings[preferred_date_format]" <?php checked( $preferred_date_format, 'F j, Y' ); ?> value="F j, Y">
diff --git a/php/classes/class-qmn-quiz-manager.php b/php/classes/class-qmn-quiz-manager.php
index 3f39fe8c1..34b929c36 100644
--- a/php/classes/class-qmn-quiz-manager.php
+++ b/php/classes/class-qmn-quiz-manager.php
@@ -733,7 +733,7 @@ public function load_questions( $quiz_id, $quiz_options, $is_quiz_page, $questio
 							if ( 1 == $quiz_options->randomness_order || 2 == $quiz_options->randomness_order ) {
 								shuffle( $tv );
 							}
-							$random = array_merge( $random, array_slice( array_unique( $tv ), 0, $quiz_options->question_per_category ) );
+							$random = array_merge( $random, array_slice( array_unique( $tv ), 0, intval( $quiz_options->question_per_category ) ) );
 						}
 					}
 					$question_ids = array_unique( $random );
diff --git a/php/classes/class-qsm-fields.php b/php/classes/class-qsm-fields.php
index 6a9a07b33..bcde15446 100644
--- a/php/classes/class-qsm-fields.php
+++ b/php/classes/class-qsm-fields.php
@@ -768,20 +768,14 @@ public static function generate_category_field( $field, $value ) {
 		$quiz_id = isset($_GET['quiz_id']) ? sanitize_text_field( wp_unslash( $_GET['quiz_id'] ) ) : 0;
 		$explode_cat = explode(',', $value);
 		$limit_category_checkbox = $mlwQuizMasterNext->pluginHelper->get_section_setting('quiz_options','limit_category_checkbox');
-		$display = "";
-		if ( ! empty($limit_category_checkbox) ) {
-			$display = "style='display:none;'";
-		} ?>
-		<tr valign="top" <?php echo esc_html( $display );?> >
+		$question_per_category = $mlwQuizMasterNext->pluginHelper->get_section_setting('quiz_options','question_per_category');
+		?>
+		<tr valign="top" <?php echo ! empty($limit_category_checkbox) || empty( $question_per_category ) ? 'style="display:none;"' : '';?> class="qsm-category-list-row">
 			<th scope="row" class="qsm-opt-tr">
-				<label for="<?php echo esc_attr( $field["id"] ); ?>"><?php echo wp_kses_post( $field['label'] ); ?></label>
-				<?php if ( isset($field['tooltip']) && '' !== $field['tooltip'] ) { ?>
-				<span class="dashicons dashicons-editor-help qsm-tooltips-icon">
-					<span class="qsm-tooltips"><?php echo wp_kses_post( $field['tooltip'] ); ?></span>
-				</span>
-				<?php } ?>
+
 			</th>
 			<td>
+				<label for="<?php echo esc_attr( $field["id"] ); ?>"><strong><?php echo wp_kses_post( $field['label'] ); ?></strong></label>
 				<?php
 				$categories = QSM_Questions::get_quiz_categories( $quiz_id );
 				$categories_tree = (isset($categories['tree']) ? $categories['tree'] : array());
@@ -958,21 +952,14 @@ public static function generate_selectinput_field( $field, $value ) {
 		) ;
 		$quiz_id = isset($_GET['quiz_id']) ? sanitize_text_field( wp_unslash( $_GET['quiz_id'] ) ) : 0;
 		$limit_category_checkbox = $mlwQuizMasterNext->pluginHelper->get_section_setting('quiz_options','limit_category_checkbox');
-		$display = "";
-		if ( '' == $limit_category_checkbox ) {
-			$display = "style='display:none;'";
-		} ?>
-		<tr valign="top" <?php echo esc_html( $display );?> >
+		?>
+		<tr valign="top" <?php echo empty( $limit_category_checkbox ) ? 'style="display:none;"' : '';?> class="qsm-category-list-row" >
 			<th scope="row" class="qsm-opt-tr">
-				<label for="<?php echo esc_attr( $field["id"] ); ?>"><?php echo wp_kses_post( $field['label'] ); ?></label>
-				<?php if ( isset($field['tooltip']) && '' !== $field['tooltip'] ) { ?>
-				<span class="dashicons dashicons-editor-help qsm-tooltips-icon">
-					<span class="qsm-tooltips"><?php echo wp_kses_post( $field['tooltip'] ); ?></span>
-				</span>
-				<?php } ?>
+
 			</th>
 			<td>
-			<div class = "select-category-question-limit-maindiv">
+				<label for="<?php echo esc_attr( $field["id"] ); ?>"><strong><?php echo wp_kses_post( $field['label'] ); ?></strong></label>
+				<div class="select-category-question-limit-maindiv">
 				<?php
 					$categories = QSM_Questions::get_quiz_categories( $quiz_id );
 					$category_select_key = ( ! empty( $value['category_select_key'] ) ) ? $value['category_select_key'] : array();
diff --git a/php/classes/class-qsm-install.php b/php/classes/class-qsm-install.php
index d4b858006..f486f9564 100644
--- a/php/classes/class-qsm-install.php
+++ b/php/classes/class-qsm-install.php
@@ -117,7 +117,7 @@ public function register_default_settings() {
 				'correct_answer_logic'   => array(
 					'type'        => 'radio',
 					/* translators: %s: HTML tag */
-					'prefix_text' => '<div class="qsm-mb-1">' . __( 'Correct Answer Logic:', 'quiz-master-next' ) . '<br/><small>' . sprintf( esc_html__( 'Works with %1$sMultiple Response, Horizontal Multiple Response%2$s and %3$sFill in the Blanks%4$s Question Types.', 'quiz-master-next' ), '<b>', '</b>', '<b>', '</b>' ) . '</small></div>',
+					'prefix_text' => '<div class="qsm-mb-1"><strong>' . __( 'Correct Answer Logic:', 'quiz-master-next' ) . '</strong><br/><label class="qsm-opt-desc">' . sprintf( esc_html__( 'Works with %1$sMultiple Response, Horizontal Multiple Response%2$s and %3$sFill in the Blanks%4$s Question Types.', 'quiz-master-next' ), '<b>', '</b>', '<b>', '</b>' ) . '</label></div>',
 					'options'     => array(
 						array(
 							'label' => __( 'Accept all correct answers', 'quiz-master-next' ),
@@ -132,7 +132,7 @@ public function register_default_settings() {
 				),
 				'enable_deselect_option' => array(
 					'type'        => 'checkbox',
-					'prefix_text' => '<div class="qsm-mb-1">' . __( 'Other Answer Settings:', 'quiz-master-next' ) . '</div>',
+					'prefix_text' => '<div class="qsm-mb-1"><strong>' . __( 'Other Answer Settings:', 'quiz-master-next' ) . '</strong></div>',
 					'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>',
@@ -155,11 +155,11 @@ public function register_default_settings() {
 					'type'    => 'checkbox',
 					'options' => array(
 						array(
-							'label' => __( 'Allow entering math formulas in questions, using TeX and LaTeX notation.', 'quiz-master-next' ),
+							'label' => __( 'Disable entering math formulas in questions, using TeX and LaTeX notation.', 'quiz-master-next' ),
 							'value' => 1,
 						),
 					),
-					'default' => 1,
+					'default' => 0,
 				),
 			),
 			'option_tab' => 'general',
@@ -240,7 +240,7 @@ public function register_default_settings() {
 				),
 				'question_per_category'   => array(
 					'type'        => 'number',
-					'suffix_text' => '<span class="qsm-opt-tr">' . __( "Limit number of questions per category", "quiz-master-next" ) . '<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>',
+					'suffix_text' => '<span class="qsm-opt-tr">' . __( "Limit number of questions per category", "quiz-master-next" ) . '<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,
 				),
 				'limit_category_checkbox' => array(
@@ -254,7 +254,7 @@ public function register_default_settings() {
 					'default' => 0,
 				),
 			),
-			'container_class' => 'qsm-small-input-field',
+			'container_class' => 'qsm-small-input-field qsm-question-limit-row',
 			'tooltip'         => __( 'Show only limited number of questions from your quiz.', 'quiz-master-next' ),
 			'option_tab'      => 'general',
 		);
@@ -263,7 +263,7 @@ public function register_default_settings() {
 		//Registers category setting
 		$field_array = array(
 			'id'         => 'randon_category',
-			'label'      => __( 'Questions Categories', 'quiz-master-next' ),
+			'label'      => __( 'Select Category', 'quiz-master-next' ),
 			'type'       => 'category',
 			'default'    => '',
 			'help'       => __( 'Questions will load only from selected categories.', 'quiz-master-next' ),
@@ -519,7 +519,7 @@ public function register_default_settings() {
 					'default'     => 0,
 					'placeholder' => __( 'Set Limit', 'quiz-master-next' ),
 					'prefix_text' => __( 'Show ', 'quiz-master-next' ),
-					'suffix_text' => __( 'Questions Per Page', 'quiz-master-next' ) . '<label class="qsm-opt-desc">' . __( "Setting a limit overrides the quiz questions default pagination. Set it to 0 or blank for default pagination.", 'quiz-master-next' ) . '</label>',
+					'suffix_text' => __( 'Questions Per Page', 'quiz-master-next' ) . '<label class="qsm-opt-desc"><i>' . __( "Setting a limit overrides the quiz questions default pagination. Set it to 0 or blank for default pagination.", 'quiz-master-next' ) . '</i></label>',
 				),
 				'question_numbering'     => array(
 					'type'    => 'checkbox',
@@ -613,12 +613,12 @@ public function register_default_settings() {
 			'type'            => 'multiple_fields',
 			'label'           => __( 'Quiz Page Settings', 'quiz-master-next' ),
 			'fields'          => array(
-				'quiz_animation'         => array(
+				'quiz_animation'                     => array(
 					'type'    => 'select',
 					'options' => $mlwQuizMasterNext->pluginHelper->quiz_animation_effect(),
 					'default' => '',
 				),
-				'enable_pagination_quiz' => array(
+				'enable_pagination_quiz'             => array(
 					'type'    => 'checkbox',
 					'options' => array(
 						array(
@@ -628,6 +628,16 @@ public function register_default_settings() {
 					),
 					'default' => 0,
 				),
+				'disable_scroll_next_previous_click' => array(
+					'type'    => 'checkbox',
+					'options' => array(
+						array(
+							'label' => __( 'Do not scroll the page on clicking next/previous buttons', 'quiz-master-next' ),
+							'value' => 1,
+						),
+					),
+					'default' => 0,
+				),
 			),
 			'container_class' => 'qsm-small-input-field',
 			'option_tab'      => 'display',
@@ -639,14 +649,14 @@ public function register_default_settings() {
 			'type'       => 'multiple_fields',
 			'label'      => __( 'Advanced Settings', 'quiz-master-next' ),
 			'fields'     => array(
-				'result_page_fb_image'               => array(
-					'prefix_text'  => __( 'Set a logo for Facebook sharing', 'quiz-master-next' ),
+				'result_page_fb_image'  => array(
+					'prefix_text'  => '<strong>' . __( 'Set a logo for Facebook sharing', 'quiz-master-next' ) . '</strong>',
 					'type'         => 'image',
 					'default'      => QSM_PLUGIN_URL . 'assets/icon-200x200.png',
 					'button_label' => __( 'Select Logo', 'quiz-master-next' ),
-					'suffix_text'  => '<label><i><small class="qsm-font-light">' . __( "This logo will be used for Facebook sharing. If left blank, QSM's logo will appear.", 'quiz-master-next' ) . '</small></i></label>',
+					'suffix_text'  => '<label class="qsm-font-light"><i>' . __( "This logo will be used for Facebook sharing. If left blank, QSM's logo will appear.", 'quiz-master-next' ) . '</i></label>',
 				),
-				'ajax_show_correct'                  => array(
+				'ajax_show_correct'     => array(
 					'type'    => 'checkbox',
 					'options' => array(
 						array(
@@ -656,17 +666,7 @@ public function register_default_settings() {
 					),
 					'default' => 0,
 				),
-				'disable_scroll_next_previous_click' => array(
-					'type'    => 'checkbox',
-					'options' => array(
-						array(
-							'label' => __( 'Do not scroll the page on clicking next/previous buttons', 'quiz-master-next' ),
-							'value' => 1,
-						),
-					),
-					'default' => 0,
-				),
-				'preferred_date_format'              => array(
+				'preferred_date_format' => array(
 					'type'    => 'radio',
 					'prefix'  => __( 'Preferred date format:', 'quiz-master-next' ),
 					'options' => array(