diff --git a/includes/qmn_credits.php b/includes/qmn_credits.php
index c200fdf74..c8275d2ca 100644
--- a/includes/qmn_credits.php
+++ b/includes/qmn_credits.php
@@ -109,7 +109,7 @@ function mlw_qmn_setTab(tab) {
 			<br />
 		</div>
 		<div id="mlw_quiz_changelog" style="display: none;">
-		<h3><?php echo $mlw_quiz_version; ?> (March 26, 2015)</h3>
+		<h3><?php echo $mlw_quiz_version; ?> (April 1, 2015)</h3>
 		<ul>
 			<li>* Minor Design Changes</li>
 		 	<li>* Minor Bug Fixes</li>
diff --git a/includes/qmn_options_certificate_tab.php b/includes/qmn_options_certificate_tab.php
index 24675bd96..7acaa8804 100644
--- a/includes/qmn_options_certificate_tab.php
+++ b/includes/qmn_options_certificate_tab.php
@@ -62,15 +62,10 @@ function mlw_options_certificate_tab_content()
 	}
 	?>
 	<div id="tabs-5" class="mlw_tab_content">
-		<script>
-			jQuery(function() {
-  				jQuery( "#enableCertificates" ).buttonset();
-			});
-		</script>
 		<h3><?php _e('Quiz Certificate (Beta)', 'quiz-master-next'); ?></h3>
 		<p><?php _e('Enter in your text here to fill in the certificate for this quiz. Be sure to enter in the link variable into the templates on the Quiz Text tab so the user can access the certificate.', 'quiz-master-next'); ?></p>
 		<p><?php _e('These fields cannot contain HTML.', 'quiz-master-next'); ?></p>
-		<button id="save_certificate_button" class="button" onclick="javascript: document.quiz_certificate_options_form.submit();"><?php _e('Save Certificate Options', 'quiz-master-next'); ?></button>
+		<button id="save_certificate_button" class="button-primary" onclick="javascript: document.quiz_certificate_options_form.submit();"><?php _e('Save Certificate Options', 'quiz-master-next'); ?></button>
 		<?php
 			echo "<form action='' method='post' name='quiz_certificate_options_form'>";
 			echo "<input type='hidden' name='save_certificate_options' value='confirmation' />";
@@ -79,10 +74,10 @@ function mlw_options_certificate_tab_content()
 		<table class="form-table">
 			<tr valign="top">
 				<td><label for="enableCertificates"><?php _e('Enable Certificates For This Quiz?', 'quiz-master-next'); ?></label></td>
-				<td><div id="enableCertificates">
-				    <input type="radio" id="radio30" name="enableCertificates" <?php if ($mlw_certificate_options[4] == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio30"><?php _e('Yes', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio31" name="enableCertificates" <?php if ($mlw_certificate_options[4] == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio31"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="radio30" name="enableCertificates" <?php if ($mlw_certificate_options[4] == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio30"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio31" name="enableCertificates" <?php if ($mlw_certificate_options[4] == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio31"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr>
 				<td width="30%">
@@ -126,7 +121,7 @@ function mlw_options_certificate_tab_content()
 				</td>
 			</tr>
 		</table>
-		<button id="save_certificate_button" class="button" onclick="javascript: document.quiz_certificate_options_form.submit();"><?php _e('Save Certificate Options', 'quiz-master-next'); ?></button>
+		<button id="save_certificate_button" class="button-primary" onclick="javascript: document.quiz_certificate_options_form.submit();"><?php _e('Save Certificate Options', 'quiz-master-next'); ?></button>
 		</form>
 	</div>
 	<?php
diff --git a/includes/qmn_options_email_tab.php b/includes/qmn_options_email_tab.php
index 7e8489e89..40cfc0a2d 100644
--- a/includes/qmn_options_email_tab.php
+++ b/includes/qmn_options_email_tab.php
@@ -316,22 +316,22 @@ function delete_admin_email(id)
 			<input type='hidden' name='mlw_add_admin_email_page' value='confirmation' />
 			<input type='hidden' name='mlw_add_admin_email_quiz_id' value='<?php echo $quiz_id; ?>' />
 		</form>
-		<button id="save_email_button" class="button" onclick="javascript: document.mlw_quiz_save_email_form.submit();"><?php _e('Save Email Templates And Settings', 'quiz-master-next'); ?></button>
+		<button id="save_email_button" class="button-primary" onclick="javascript: document.mlw_quiz_save_email_form.submit();"><?php _e('Save Email Templates And Settings', 'quiz-master-next'); ?></button>
 		<form method="post" action="" name="mlw_quiz_save_email_form">
 			<table class="form-table">
 			<tr valign="top">
 				<th scope="row"><label for="sendUserEmail"><?php _e('Send user email upon completion?', 'quiz-master-next'); ?></label></th>
-				<td><div id="sendUserEmail">
-				    <input type="radio" id="radio5" name="sendUserEmail" <?php if ($mlw_quiz_options->send_user_email == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio5"><?php _e('Yes', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio6" name="sendUserEmail" <?php if ($mlw_quiz_options->send_user_email == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio6"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="radio5" name="sendUserEmail" <?php if ($mlw_quiz_options->send_user_email == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio5"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio6" name="sendUserEmail" <?php if ($mlw_quiz_options->send_user_email == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio6"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="sendAdminEmail"><?php _e('Send admin email upon completion?', 'quiz-master-next'); ?></label></th>
-				<td><div id="sendAdminEmail">
-				    <input type="radio" id="radio19" name="sendAdminEmail" <?php if ($mlw_quiz_options->send_admin_email == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio19"><?php _e('Yes', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio20" name="sendAdminEmail" <?php if ($mlw_quiz_options->send_admin_email == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio20"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="radio19" name="sendAdminEmail" <?php if ($mlw_quiz_options->send_admin_email == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio19"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio20" name="sendAdminEmail" <?php if ($mlw_quiz_options->send_admin_email == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio20"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="adminEmail"><?php _e('What emails should we send the admin email to? Separate emails with a comma.', 'quiz-master-next'); ?></label></th>
@@ -515,7 +515,7 @@ function delete_admin_email(id)
 		</form>
 		<br />
 		<br />
-		<button id="save_email_button" class="button" onclick="javascript: document.mlw_quiz_save_email_form.submit();"><?php _e('Save Email Templates And Settings', 'quiz-master-next'); ?></button>
+		<button id="save_email_button" class="button-primary" onclick="javascript: document.mlw_quiz_save_email_form.submit();"><?php _e('Save Email Templates And Settings', 'quiz-master-next'); ?></button>
 	</div>
 	<?php
 }
diff --git a/includes/qmn_options_leaderboard_tab.php b/includes/qmn_options_leaderboard_tab.php
index 6bbf9a3e9..d681e56d3 100644
--- a/includes/qmn_options_leaderboard_tab.php
+++ b/includes/qmn_options_leaderboard_tab.php
@@ -77,7 +77,7 @@ function mlw_options_leaderboard_tab_content()
 				<td><strong>%QUIZ_NAME%</strong> - <?php _e("The name of the quiz", 'quiz-master-next'); ?></td>
 			</tr>
 		</table>
-		<button id="save_template_button" class="button" onclick="javascript: document.quiz_leaderboard_options_form.submit();"><?php _e("Save Leaderboard Options", 'quiz-master-next'); ?></button>
+		<button id="save_template_button" class="button-primary" onclick="javascript: document.quiz_leaderboard_options_form.submit();"><?php _e("Save Leaderboard Options", 'quiz-master-next'); ?></button>
 		<?php
 			echo "<form action='' method='post' name='quiz_leaderboard_options_form'>";
 			echo "<input type='hidden' name='save_leaderboard_options' value='confirmation' />";
@@ -105,7 +105,7 @@ function mlw_options_leaderboard_tab_content()
 				</td>
 			</tr>
 		</table>
-		<button id="save_template_button" class="button" onclick="javascript: document.quiz_leaderboard_options_form.submit();"><?php _e("Save Leaderboard Options", 'quiz-master-next'); ?></button>
+		<button id="save_template_button" class="button-primary" onclick="javascript: document.quiz_leaderboard_options_form.submit();"><?php _e("Save Leaderboard Options", 'quiz-master-next'); ?></button>
 		</form>
 	</div>
 	<?php
diff --git a/includes/qmn_options_option_tab.php b/includes/qmn_options_option_tab.php
index 78a9e4391..a6a054c82 100644
--- a/includes/qmn_options_option_tab.php
+++ b/includes/qmn_options_option_tab.php
@@ -122,11 +122,11 @@ function mlw_options_option_tab_content()
 	<div id="tabs-3" class="mlw_tab_content">
 		<script>
 			jQuery(function() {
-    			jQuery( "#system, #require_log_in, #randomness_order, #loggedin_user_contact, #sendUserEmail, #sendAdminEmail, #contact_info_location, #userName, #userComp, #userEmail, #userPhone, #pagination, #commentSection, #social_media, #question_numbering, #comments" ).buttonset();
+    			//jQuery( "#system, #require_log_in, #randomness_order, #loggedin_user_contact, #sendUserEmail, #sendAdminEmail, #contact_info_location, #userName, #userComp, #userEmail, #userPhone, #pagination, #commentSection, #social_media, #question_numbering, #comments" ).buttonset();
     			jQuery( "#scheduled_time_start, #scheduled_time_end" ).datepicker();
 			});
 		</script>
-		<button id="save_options_button" class="button" onclick="javascript: document.quiz_options_form.submit();"><?php _e('Save Options', 'quiz-master-next'); ?></button>
+		<button id="save_options_button" class="button-primary" onclick="javascript: document.quiz_options_form.submit();"><?php _e('Save Options', 'quiz-master-next'); ?></button>
 		<?php
 		echo "<form action='' method='post' name='quiz_options_form'>";
 		echo "<input type='hidden' name='save_options' value='confirmation' />";
@@ -135,18 +135,18 @@ function mlw_options_option_tab_content()
 		<table class="form-table" style="width: 100%;">
 			<tr valign="top">
 				<th scope="row"><label for="system"><?php _e('Which system is this quiz graded on?', 'quiz-master-next'); ?></label></th>
-				<td><div id="system">
-				    <input type="radio" id="radio1" name="system" <?php if ($mlw_quiz_options->system == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio1"><?php _e('Correct/Incorrect', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio2" name="system" <?php if ($mlw_quiz_options->system == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio2"><?php _e('Points', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio3" name="system" <?php if ($mlw_quiz_options->system == 2) {echo 'checked="checked"';} ?> value='2' /><label for="radio3"><?php _e('Not Graded', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="radio1" name="system" <?php if ($mlw_quiz_options->system == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio1"><?php _e('Correct/Incorrect', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio2" name="system" <?php if ($mlw_quiz_options->system == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio2"><?php _e('Points', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio3" name="system" <?php if ($mlw_quiz_options->system == 2) {echo 'checked="checked"';} ?> value='2' /><label for="radio3"><?php _e('Not Graded', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="require_log_in"><?php _e('Should the user be required to be logged in to take this quiz?', 'quiz-master-next'); ?></label></th>
-				<td><div id="require_log_in">
-				    <input type="radio" id="radio_login_1" name="require_log_in" <?php if ($mlw_quiz_options->require_log_in == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio_login_1"><?php _e('Yes', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio_login_2" name="require_log_in" <?php if ($mlw_quiz_options->require_log_in == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio_login_2"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="radio_login_1" name="require_log_in" <?php if ($mlw_quiz_options->require_log_in == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio_login_1"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio_login_2" name="require_log_in" <?php if ($mlw_quiz_options->require_log_in == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio_login_2"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="pagination"><?php _e('How many questions per page would you like? (Leave 0 for all questions on one page)', 'quiz-master-next'); ?></label></th>
@@ -189,81 +189,81 @@ function mlw_options_option_tab_content()
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="randomness_order"><?php _e('Are the questions random? (Question Order will not apply if this is yes)', 'quiz-master-next'); ?></label></th>
-				<td><div id="randomness_order">
-					<input type="radio" id="radio24" name="randomness_order" <?php if ($mlw_quiz_options->randomness_order == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio24"><?php _e('Random Questions', 'quiz-master-next'); ?></label>
-					<input type="radio" id="randomness2" name="randomness_order" <?php if ($mlw_quiz_options->randomness_order == 2) {echo 'checked="checked"';} ?> value='2' /><label for="randomness2"><?php _e('Random Questions And Answers', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio23" name="randomness_order" <?php if ($mlw_quiz_options->randomness_order == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio23"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+					<input type="radio" id="radio24" name="randomness_order" <?php if ($mlw_quiz_options->randomness_order == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio24"><?php _e('Random Questions', 'quiz-master-next'); ?></label><br>
+					<input type="radio" id="randomness2" name="randomness_order" <?php if ($mlw_quiz_options->randomness_order == 2) {echo 'checked="checked"';} ?> value='2' /><label for="randomness2"><?php _e('Random Questions And Answers', 'quiz-master-next'); ?></label><br>
+				  <input type="radio" id="radio23" name="randomness_order" <?php if ($mlw_quiz_options->randomness_order == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio23"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="contact_info_location"><?php _e('Would you like to ask for the contact information at the beginning or at the end of the quiz?', 'quiz-master-next'); ?></label></th>
-				<td><div id="contact_info_location">
-				    <input type="radio" id="radio25" name="contact_info_location" <?php if ($mlw_quiz_options->contact_info_location == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio25"><?php _e('Beginning', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio26" name="contact_info_location" <?php if ($mlw_quiz_options->contact_info_location == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio26"><?php _e('End', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="radio25" name="contact_info_location" <?php if ($mlw_quiz_options->contact_info_location == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio25"><?php _e('Beginning', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio26" name="contact_info_location" <?php if ($mlw_quiz_options->contact_info_location == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio26"><?php _e('End', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="loggedin_user_contact"><?php _e('If a logged-in user takes the quiz, would you like them to be able to edit contact information? If set to no, the fields will not show up for logged in users; however, the users information will be saved for the fields.', 'quiz-master-next'); ?></label></th>
-				<td><div id="loggedin_user_contact">
-				    <input type="radio" id="radio27" name="loggedin_user_contact" <?php if ($mlw_quiz_options->loggedin_user_contact == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio27"><?php _e('Yes', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio28" name="loggedin_user_contact" <?php if ($mlw_quiz_options->loggedin_user_contact == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio28"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="radio27" name="loggedin_user_contact" <?php if ($mlw_quiz_options->loggedin_user_contact == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio27"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio28" name="loggedin_user_contact" <?php if ($mlw_quiz_options->loggedin_user_contact == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio28"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="userName"><?php _e('Should we ask for users name?', 'quiz-master-next'); ?></label></th>
-				<td><div id="userName">
-				    <input type="radio" id="radio7" name="userName" <?php if ($mlw_quiz_options->user_name == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio7"><?php _e('Yes', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio8" name="userName" <?php if ($mlw_quiz_options->user_name == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio8"><?php _e('Require', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio9" name="userName" <?php if ($mlw_quiz_options->user_name == 2) {echo 'checked="checked"';} ?> value='2' /><label for="radio9"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="radio7" name="userName" <?php if ($mlw_quiz_options->user_name == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio7"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio8" name="userName" <?php if ($mlw_quiz_options->user_name == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio8"><?php _e('Require', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio9" name="userName" <?php if ($mlw_quiz_options->user_name == 2) {echo 'checked="checked"';} ?> value='2' /><label for="radio9"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="userComp"><?php _e('Should we ask for users business?', 'quiz-master-next'); ?></label></th>
-				<td><div id="userComp">
-				    <input type="radio" id="radio10" name="userComp" <?php if ($mlw_quiz_options->user_comp == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio10"><?php _e('Yes', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio11" name="userComp" <?php if ($mlw_quiz_options->user_comp == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio11"><?php _e('Require', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio12" name="userComp" <?php if ($mlw_quiz_options->user_comp == 2) {echo 'checked="checked"';} ?> value='2' /><label for="radio12"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="radio10" name="userComp" <?php if ($mlw_quiz_options->user_comp == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio10"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio11" name="userComp" <?php if ($mlw_quiz_options->user_comp == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio11"><?php _e('Require', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio12" name="userComp" <?php if ($mlw_quiz_options->user_comp == 2) {echo 'checked="checked"';} ?> value='2' /><label for="radio12"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="userEmail"><?php _e('Should we ask for users email?', 'quiz-master-next'); ?></label></th>
-				<td><div id="userEmail">
-				    <input type="radio" id="radio13" name="userEmail" <?php if ($mlw_quiz_options->user_email == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio13"><?php _e('Yes', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio14" name="userEmail" <?php if ($mlw_quiz_options->user_email == 1) {echo 'checked="checked"';} ?> value='1'/><label for="radio14"><?php _e('Require', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio15" name="userEmail" <?php if ($mlw_quiz_options->user_email == 2) {echo 'checked="checked"';} ?> value='2' /><label for="radio15"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="radio13" name="userEmail" <?php if ($mlw_quiz_options->user_email == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio13"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio14" name="userEmail" <?php if ($mlw_quiz_options->user_email == 1) {echo 'checked="checked"';} ?> value='1'/><label for="radio14"><?php _e('Require', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio15" name="userEmail" <?php if ($mlw_quiz_options->user_email == 2) {echo 'checked="checked"';} ?> value='2' /><label for="radio15"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="userPhone"><?php _e('Should we ask for users phone number?', 'quiz-master-next'); ?></label></th>
-				<td><div id="userPhone">
-				    <input type="radio" id="radio16" name="userPhone" <?php if ($mlw_quiz_options->user_phone == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio16"><?php _e('Yes', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio17" name="userPhone" <?php if ($mlw_quiz_options->user_phone == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio17"><?php _e('Require', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio18" name="userPhone" <?php if ($mlw_quiz_options->user_phone == 2) {echo 'checked="checked"';} ?> value='2' /><label for="radio18"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="radio16" name="userPhone" <?php if ($mlw_quiz_options->user_phone == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio16"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio17" name="userPhone" <?php if ($mlw_quiz_options->user_phone == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio17"><?php _e('Require', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio18" name="userPhone" <?php if ($mlw_quiz_options->user_phone == 2) {echo 'checked="checked"';} ?> value='2' /><label for="radio18"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="commentSection"><?php _e('Would you like a place for the user to enter comments?', 'quiz-master-next'); ?></label></th>
-				<td><div id="commentSection">
-				    <input type="radio" id="radio21" name="commentSection" <?php if ($mlw_quiz_options->comment_section == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio21"><?php _e('Yes', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="radio22" name="commentSection" <?php if ($mlw_quiz_options->comment_section == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio22"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="radio21" name="commentSection" <?php if ($mlw_quiz_options->comment_section == 0) {echo 'checked="checked"';} ?> value='0' /><label for="radio21"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="radio22" name="commentSection" <?php if ($mlw_quiz_options->comment_section == 1) {echo 'checked="checked"';} ?> value='1' /><label for="radio22"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="question_numbering"><?php _e('Show question number on quiz?', 'quiz-master-next'); ?></label></th>
-				<td><div id="question_numbering">
-				    <input type="radio" id="question_numbering_radio2" name="question_numbering" <?php if ($mlw_quiz_options->question_numbering == 1) {echo 'checked="checked"';} ?> value='1' /><label for="question_numbering_radio2"><?php _e('Yes', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="question_numbering_radio" name="question_numbering" <?php if ($mlw_quiz_options->question_numbering == 0) {echo 'checked="checked"';} ?> value='0' /><label for="question_numbering_radio"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+				    <input type="radio" id="question_numbering_radio2" name="question_numbering" <?php if ($mlw_quiz_options->question_numbering == 1) {echo 'checked="checked"';} ?> value='1' /><label for="question_numbering_radio2"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
+				    <input type="radio" id="question_numbering_radio" name="question_numbering" <?php if ($mlw_quiz_options->question_numbering == 0) {echo 'checked="checked"';} ?> value='0' /><label for="question_numbering_radio"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 			<tr valign="top">
 				<th scope="row"><label for="social_media"><?php _e('Show social media sharing buttons? (Twitter & Facebook)', 'quiz-master-next'); _e('This option is for here only for users of older versions. Please use the new template variables %FACEBOOK_SHARE% %TWITTER_SHARE% on your results pages instead of using this option!', 'quiz-master-next'); ?></label></th>
-				<td><div id="social_media">
-					<input type="radio" id="social_media_radio2" name="social_media" <?php if ($mlw_quiz_options->social_media == 1) {echo 'checked="checked"';} ?> value='1' /><label for="social_media_radio2"><?php _e('Yes', 'quiz-master-next'); ?></label>
-				    <input type="radio" id="social_media_radio" name="social_media" <?php if ($mlw_quiz_options->social_media == 0) {echo 'checked="checked"';} ?> value='0' /><label for="social_media_radio"><?php _e('No', 'quiz-master-next'); ?></label>
-				</div></td>
+				<td>
+					<input type="radio" id="social_media_radio2" name="social_media" <?php if ($mlw_quiz_options->social_media == 1) {echo 'checked="checked"';} ?> value='1' /><label for="social_media_radio2"><?php _e('Yes', 'quiz-master-next'); ?></label><br>
+				  <input type="radio" id="social_media_radio" name="social_media" <?php if ($mlw_quiz_options->social_media == 0) {echo 'checked="checked"';} ?> value='0' /><label for="social_media_radio"><?php _e('No', 'quiz-master-next'); ?></label><br>
+				</td>
 			</tr>
 		</table>
-		<button id="save_options_button" class="button" onclick="javascript: document.quiz_options_form.submit();"><?php _e('Save Options', 'quiz-master-next'); ?></button>
+		<button id="save_options_button" class="button-primary" onclick="javascript: document.quiz_options_form.submit();"><?php _e('Save Options', 'quiz-master-next'); ?></button>
 		</form>
   		</div>
 	<?php
diff --git a/includes/qmn_options_questions_tab.php b/includes/qmn_options_questions_tab.php
index 9c54ddeee..2b8bc1fb9 100644
--- a/includes/qmn_options_questions_tab.php
+++ b/includes/qmn_options_questions_tab.php
@@ -726,7 +726,8 @@ function mlw_add_answer_to_new_question()
 				</tr>
 			</tfoot>
 		</table>
-		<button class="button" id="new_question_button"><?php _e('Add Question', 'quiz-master-next'); ?></button>
+		<br>
+		<button class="add-new-h2" id="new_question_button"><?php _e('Add Question', 'quiz-master-next'); ?></button>
 		<div id="new_question_dialog" title="Create New Question" style="display:none;">
 
 		<?php
diff --git a/includes/qmn_options_results_page_tab.php b/includes/qmn_options_results_page_tab.php
index 45f3e4c23..4f31f9cf2 100644
--- a/includes/qmn_options_results_page_tab.php
+++ b/includes/qmn_options_results_page_tab.php
@@ -196,7 +196,7 @@ function delete_landing(id)
 			<?php do_action('qmn_template_variable_list'); ?>
 		</div>
 		<div style="clear:both;"></div>
-		<button id="save_landing_button" class="button" onclick="javascript: document.mlw_quiz_save_landing_form.submit();"><?php _e('Save Results Pages', 'quiz-master-next'); ?></button>
+		<button id="save_landing_button" class="button-primary" onclick="javascript: document.mlw_quiz_save_landing_form.submit();"><?php _e('Save Results Pages', 'quiz-master-next'); ?></button>
 		<button id="new_landing_button" class="button" onclick="javascript: document.mlw_quiz_add_landing_form.submit();"><?php _e('Add New Results Page', 'quiz-master-next'); ?></button>
 		<form method="post" action="" name="mlw_quiz_save_landing_form" style=" display:inline!important;">
 		<table class="widefat">
@@ -277,7 +277,7 @@ function delete_landing(id)
 		<input type='hidden' name='mlw_save_landing_pages' value='confirmation' />
 		<input type='hidden' name='mlw_landing_quiz_id' value='<?php echo $quiz_id; ?>' />
 		<input type='hidden' name='mlw_landing_page_total' value='<?php echo $mlw_each_count; ?>' />
-		<button id="save_landing_button" class="button" onclick="javascript: document.mlw_quiz_save_landing_form.submit();"><?php _e('Save Results Pages', 'quiz-master-next'); ?></button>
+		<button id="save_landing_button" class="button-primary" onclick="javascript: document.mlw_quiz_save_landing_form.submit();"><?php _e('Save Results Pages', 'quiz-master-next'); ?></button>
 		</form>
 		<form method="post" action="" name="mlw_quiz_add_landing_form" style=" display:inline!important;">
 			<input type='hidden' name='mlw_add_landing_page' value='confirmation' />
diff --git a/includes/qmn_options_style_tab.php b/includes/qmn_options_style_tab.php
index 9cb3ccd97..ed4608d5a 100644
--- a/includes/qmn_options_style_tab.php
+++ b/includes/qmn_options_style_tab.php
@@ -91,19 +91,19 @@ function mlw_qmn_theme(theme)
 			mlw_qmn_theme('<?php echo $mlw_quiz_options->theme_selected; ?>');
 		</script>
 		<br /><br />
-		<button id="save_styles_button" class="button" onclick="javascript: document.quiz_style_form.submit();"><?php _e('Save Quiz Style', 'quiz-master-next'); ?></button>
+		<button id="save_styles_button" class="button-primary" onclick="javascript: document.quiz_style_form.submit();"><?php _e('Save Quiz Style', 'quiz-master-next'); ?></button>
 		<hr />
 		<h3><?php _e('Custom Style CSS', 'quiz-master-next'); ?></h3>
 		<p><?php _e('For detailed help and guidance along with a list of different classes used in this plugin, please visit the following link:', 'quiz-master-next'); ?>
 		<a target="_blank" href="http://quizmasternext.com/quiz-master-next-editing-quizs-style/">Style Guide</a></p>
-		<button id="save_styles_button" class="button" onclick="javascript: document.quiz_style_form.submit();">Save Quiz Style</button>
+		<button id="save_styles_button" class="button-primary" onclick="javascript: document.quiz_style_form.submit();">Save Quiz Style</button>
 
 		<table class="form-table">
 			<tr>
 				<td><textarea style="width: 100%; height: 700px;" id="quiz_css" name="quiz_css"><?php echo $mlw_quiz_options->quiz_stye; ?></textarea></td>
 			</tr>
 		</table>
-		<button id="save_styles_button" class="button" onclick="javascript: document.quiz_style_form.submit();"><?php _e('Save Quiz Style', 'quiz-master-next'); ?></button>
+		<button id="save_styles_button" class="button-primary" onclick="javascript: document.quiz_style_form.submit();"><?php _e('Save Quiz Style', 'quiz-master-next'); ?></button>
 		</form>
 	</div>
 	<?php
diff --git a/includes/qmn_options_text_tab.php b/includes/qmn_options_text_tab.php
index dc63d53fd..9aec35581 100644
--- a/includes/qmn_options_text_tab.php
+++ b/includes/qmn_options_text_tab.php
@@ -166,7 +166,8 @@ function mlw_options_text_tab_content()
 				<?php do_action('qmn_template_variable_list'); ?>
 			</div>
 			<div style="clear:both;"></div>
-			<button id="save_template_button" class="button" onclick="javascript: document.quiz_template_form.submit();"><?php _e("Save Templates", 'quiz-master-next'); ?></button>
+			<br>
+			<button id="save_template_button" class="button-primary" onclick="javascript: document.quiz_template_form.submit();"><?php _e("Save Templates", 'quiz-master-next'); ?></button>
 			<?php
 			echo "<form action='' method='post' name='quiz_template_form'>";
 			echo "<input type='hidden' name='save_templates' value='confirmation' />";
@@ -326,7 +327,7 @@ function mlw_options_text_tab_content()
 					<td><input name="pagination_next_text" type="text" id="pagination_next_text" value="<?php echo $mlw_qmn_pagination_text[1]; ?>" class="regular-text" /></td>
 				</tr>
 			</table>
-			<button id="save_template_button" class="button" onclick="javascript: document.quiz_template_form.submit();"><?php _e("Save Templates", 'quiz-master-next'); ?></button>
+			<button id="save_template_button" class="button-primary" onclick="javascript: document.quiz_template_form.submit();"><?php _e("Save Templates", 'quiz-master-next'); ?></button>
 			<?php echo "</form>"; ?>
   		</div>
 	<?php
diff --git a/includes/qmn_template_variables.php b/includes/qmn_template_variables.php
index 306ba2536..1ce6bb405 100644
--- a/includes/qmn_template_variables.php
+++ b/includes/qmn_template_variables.php
@@ -198,7 +198,7 @@ function mlw_qmn_variable_question_answers($content, $mlw_quiz_array)
 			$mlw_question_answer_display = htmlspecialchars_decode($qmn_question_answer_template, ENT_QUOTES);
 			$mlw_question_answer_display = str_replace( "%QUESTION%" , htmlspecialchars_decode($answer[0], ENT_QUOTES), $mlw_question_answer_display);
 			$mlw_question_answer_display = str_replace( "%USER_ANSWER%" , htmlspecialchars_decode($answer[1], ENT_QUOTES), $mlw_question_answer_display);
-			$mlw_question_answer_display = str_replace( "%CORRECT_ANSWER%" , $answer[2], $mlw_question_answer_display);
+			$mlw_question_answer_display = str_replace( "%CORRECT_ANSWER%" , htmlspecialchars_decode($answer[2], ENT_QUOTES), $mlw_question_answer_display);
 			$mlw_question_answer_display = str_replace( "%USER_COMMENTS%" , $answer[3], $mlw_question_answer_display);
 			$mlw_question_answer_display = str_replace( "%CORRECT_ANSWER_INFO%" , htmlspecialchars_decode($qmn_questions[$answer['id']], ENT_QUOTES), $mlw_question_answer_display);
 			$display .= apply_filters('qmn_variable_question_answers', $mlw_question_answer_display, $mlw_quiz_array);
diff --git a/languages/quiz-master-next-da_DK.mo b/languages/quiz-master-next-da_DK.mo
index 39166c9ad..7c64b4027 100644
Binary files a/languages/quiz-master-next-da_DK.mo and b/languages/quiz-master-next-da_DK.mo differ
diff --git a/languages/quiz-master-next-da_DK.po b/languages/quiz-master-next-da_DK.po
index 1372d75d2..07168cd08 100644
--- a/languages/quiz-master-next-da_DK.po
+++ b/languages/quiz-master-next-da_DK.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Quiz Master Next\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-25 20:59-0500\n"
+"POT-Creation-Date: 2015-03-31 20:21-0500\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Frank Corso <frank@mylocalwebstop.com>\n"
 "Language-Team: My Local Webstop <fpcorso@mylocalwebstop.com>\n"
@@ -425,16 +425,16 @@ msgid "Leaderboard Template"
 msgstr "Leaderboard skabelon"
 
 #: includes/qmn_options_leaderboard_tab.php:91
-#: includes/qmn_options_text_tab.php:181
-#: includes/qmn_options_text_tab.php:191
-#: includes/qmn_options_text_tab.php:201
-#: includes/qmn_options_text_tab.php:211
-#: includes/qmn_options_text_tab.php:221
-#: includes/qmn_options_text_tab.php:231
-#: includes/qmn_options_text_tab.php:241
-#: includes/qmn_options_text_tab.php:251
-#: includes/qmn_options_text_tab.php:264
-#: includes/qmn_options_text_tab.php:281
+#: includes/qmn_options_text_tab.php:182
+#: includes/qmn_options_text_tab.php:192
+#: includes/qmn_options_text_tab.php:202
+#: includes/qmn_options_text_tab.php:212
+#: includes/qmn_options_text_tab.php:222
+#: includes/qmn_options_text_tab.php:232
+#: includes/qmn_options_text_tab.php:242
+#: includes/qmn_options_text_tab.php:252
+#: includes/qmn_options_text_tab.php:265
+#: includes/qmn_options_text_tab.php:282
 msgid "Allowed Variables:"
 msgstr "Tilladte variable"
 
@@ -458,88 +458,88 @@ msgstr "Tekst"
 msgid "The templates has been updated successfully."
 msgstr "Skabelonerne er blevet opdateret"
 
-#: includes/qmn_options_text_tab.php:169
-#: includes/qmn_options_text_tab.php:329
+#: includes/qmn_options_text_tab.php:170
+#: includes/qmn_options_text_tab.php:330
 msgid "Save Templates"
 msgstr "Gem skabeloner"
 
-#: includes/qmn_options_text_tab.php:175
+#: includes/qmn_options_text_tab.php:176
 msgid "Message Templates"
 msgstr "Besked skabeloner"
 
-#: includes/qmn_options_text_tab.php:179
+#: includes/qmn_options_text_tab.php:180
 msgid "Message Displayed Before Quiz"
 msgstr "Besked vist før Quiz"
 
-#: includes/qmn_options_text_tab.php:189
+#: includes/qmn_options_text_tab.php:190
 msgid "Message Displayed Before Comments Box If Enabled"
 msgstr "Besked vist før kommentar boksen hvis aktiv"
 
-#: includes/qmn_options_text_tab.php:199
+#: includes/qmn_options_text_tab.php:200
 msgid "Message Displayed At End Of Quiz (Leave Blank To Omit Text Section)"
 msgstr "Besked vist ved slutningen af Quizzen (Vis blank for at undlade tekst sektion)"
 
-#: includes/qmn_options_text_tab.php:209
+#: includes/qmn_options_text_tab.php:210
 msgid "Message Displayed If User Has Tried Quiz Too Many Times"
 msgstr "Besked vist hvis brugeren har deltaget for mange gange"
 
-#: includes/qmn_options_text_tab.php:219
+#: includes/qmn_options_text_tab.php:220
 msgid "Message Displayed If User Is Not Logged In And Quiz Requires Users To Be Logged In"
 msgstr "Besked vist, hvis brugeren skal være logget ind for at besvare denne Quiz"
 
-#: includes/qmn_options_text_tab.php:229
+#: includes/qmn_options_text_tab.php:230
 msgid "Message Displayed If Date Is Outside Scheduled Timeframe"
 msgstr "Besked hvis dato er udenfor planlagt Tidsramme"
 
-#: includes/qmn_options_text_tab.php:239
+#: includes/qmn_options_text_tab.php:240
 msgid "Message Displayed If The Limit Of Total Entries Has Been Reached"
 msgstr "Besked Hvis grænsen på indtastninger er nået"
 
-#: includes/qmn_options_text_tab.php:249
+#: includes/qmn_options_text_tab.php:250
 msgid "%QUESTIONS_ANSWERS% Text"
 msgstr "% QUESTIONS_ANSWERS% Tekst"
 
-#: includes/qmn_options_text_tab.php:262
+#: includes/qmn_options_text_tab.php:263
 msgid "Twitter Sharing Text"
 msgstr "Twitter Deling tekst"
 
-#: includes/qmn_options_text_tab.php:279
+#: includes/qmn_options_text_tab.php:280
 msgid "Facebook Sharing Text"
 msgstr "Facebook Deling tekst"
 
-#: includes/qmn_options_text_tab.php:294
+#: includes/qmn_options_text_tab.php:295
 msgid "Other Templates"
 msgstr "Andre skabeloner"
 
-#: includes/qmn_options_text_tab.php:297
+#: includes/qmn_options_text_tab.php:298
 msgid "Text for submit button"
 msgstr "Tekst for send-knappen"
 
-#: includes/qmn_options_text_tab.php:301
+#: includes/qmn_options_text_tab.php:302
 msgid "Text for name field"
 msgstr "Tekst til navnefeltet"
 
-#: includes/qmn_options_text_tab.php:305
+#: includes/qmn_options_text_tab.php:306
 msgid "Text for business field"
 msgstr "Tekst til firma felt"
 
-#: includes/qmn_options_text_tab.php:309
+#: includes/qmn_options_text_tab.php:310
 msgid "Text for email field"
 msgstr "Tekst til e-mail-feltet"
 
-#: includes/qmn_options_text_tab.php:313
+#: includes/qmn_options_text_tab.php:314
 msgid "Text for phone number field"
 msgstr "Tekst til telefon nummer felt"
 
-#: includes/qmn_options_text_tab.php:317
+#: includes/qmn_options_text_tab.php:318
 msgid "Text for comments field"
 msgstr "Tekst for kommentarer felt"
 
-#: includes/qmn_options_text_tab.php:321
+#: includes/qmn_options_text_tab.php:322
 msgid "Text for previous button"
 msgstr "Tekst til forrige knap"
 
-#: includes/qmn_options_text_tab.php:325
+#: includes/qmn_options_text_tab.php:326
 msgid "Text for next button"
 msgstr "Tekst til næste knap"
 
@@ -603,40 +603,40 @@ msgstr "Certifikatet er blevet opdateret."
 msgid "Enter title here"
 msgstr "Indtast titel her"
 
-#: includes/qmn_options_certificate_tab.php:70
+#: includes/qmn_options_certificate_tab.php:65
 msgid "Quiz Certificate (Beta)"
 msgstr "Quiz Certificate (Beta)"
 
-#: includes/qmn_options_certificate_tab.php:71
+#: includes/qmn_options_certificate_tab.php:66
 msgid "Enter in your text here to fill in the certificate for this quiz. Be sure to enter in the link variable into the templates on the Quiz Text tab so the user can access the certificate."
 msgstr "Indtast din tekst her for at udfylde attesten for denne quiz. Sørg for at indtaste i linket variabel i skabelonerne under fanen Quiz tekst, så brugeren kan få adgang til certifikatet."
 
-#: includes/qmn_options_certificate_tab.php:72
+#: includes/qmn_options_certificate_tab.php:67
 msgid "These fields cannot contain HTML."
 msgstr "Disse felter kan ikke indeholde HTML."
 
-#: includes/qmn_options_certificate_tab.php:73
-#: includes/qmn_options_certificate_tab.php:129
+#: includes/qmn_options_certificate_tab.php:68
+#: includes/qmn_options_certificate_tab.php:124
 msgid "Save Certificate Options"
 msgstr "Gem Certificate indstillinger"
 
-#: includes/qmn_options_certificate_tab.php:81
+#: includes/qmn_options_certificate_tab.php:76
 msgid "Enable Certificates For This Quiz?"
 msgstr "Aktiver certifikater for denne quiz?"
 
-#: includes/qmn_options_certificate_tab.php:89
+#: includes/qmn_options_certificate_tab.php:84
 msgid "Certificate Title"
 msgstr "Certifikat Titel"
 
-#: includes/qmn_options_certificate_tab.php:96
+#: includes/qmn_options_certificate_tab.php:91
 msgid "Message Displayed On Certificate"
 msgstr "Meddelelse på Certifikat"
 
-#: includes/qmn_options_certificate_tab.php:116
+#: includes/qmn_options_certificate_tab.php:111
 msgid "URL To Logo (Must be JPG, JPEG, PNG or GIF)"
 msgstr "URL til Logo (Skal være JPG, JPEG, PNG eller GIF)"
 
-#: includes/qmn_options_certificate_tab.php:123
+#: includes/qmn_options_certificate_tab.php:118
 msgid "URL To Background Img (Must be JPG, JPEG, PNG or GIF)"
 msgstr "URL til Baggrund Img (Skal være JPG, JPEG, PNG eller GIF)"
 
@@ -676,12 +676,12 @@ msgstr "Spørgsmålet er blevet oprettet."
 #: includes/qmn_options_questions_tab.php:454
 #: includes/qmn_options_questions_tab.php:461
 #: includes/qmn_options_questions_tab.php:593
-#: includes/qmn_options_questions_tab.php:760
+#: includes/qmn_options_questions_tab.php:761
 msgid "Answer"
 msgstr "Svar:"
 
 #: includes/qmn_options_questions_tab.php:481
-#: includes/qmn_options_questions_tab.php:729
+#: includes/qmn_options_questions_tab.php:730
 msgid "Add Question"
 msgstr "Nyt spørgsmål"
 
@@ -706,90 +706,90 @@ msgid "Delete"
 msgstr "Slet"
 
 #: includes/qmn_options_questions_tab.php:568
-#: includes/qmn_options_questions_tab.php:737
+#: includes/qmn_options_questions_tab.php:738
 msgid "For fill in the blank types, use %BLANK% to represent where to put the text box in your text."
 msgstr ""
 
 #: includes/qmn_options_questions_tab.php:571
 #: includes/qmn_options_questions_tab.php:714
 #: includes/qmn_options_questions_tab.php:725
-#: includes/qmn_options_questions_tab.php:740
+#: includes/qmn_options_questions_tab.php:741
 msgid "Question"
 msgstr "Spørgsmål"
 
 #: includes/qmn_options_questions_tab.php:582
-#: includes/qmn_options_questions_tab.php:751
+#: includes/qmn_options_questions_tab.php:752
 msgid "Answers"
 msgstr "Svar"
 
 #: includes/qmn_options_questions_tab.php:583
-#: includes/qmn_options_questions_tab.php:752
+#: includes/qmn_options_questions_tab.php:753
 msgid "Points Worth"
 msgstr "Værdi af point"
 
 #: includes/qmn_options_questions_tab.php:584
-#: includes/qmn_options_questions_tab.php:753
+#: includes/qmn_options_questions_tab.php:754
 msgid "Correct Answer"
 msgstr "Korrekt svar"
 
 #: includes/qmn_options_questions_tab.php:611
-#: includes/qmn_options_questions_tab.php:775
+#: includes/qmn_options_questions_tab.php:776
 msgid "Add New Answer!"
 msgstr "Tilføj nyt svar!"
 
 #: includes/qmn_options_questions_tab.php:616
-#: includes/qmn_options_questions_tab.php:780
+#: includes/qmn_options_questions_tab.php:781
 msgid "Correct Answer Info"
 msgstr "Info for korrekt svar"
 
 #: includes/qmn_options_questions_tab.php:634
 #: includes/qmn_options_questions_tab.php:712
 #: includes/qmn_options_questions_tab.php:723
-#: includes/qmn_options_questions_tab.php:798
+#: includes/qmn_options_questions_tab.php:799
 msgid "Question Type"
 msgstr "Spørgsmål type"
 
 #: includes/qmn_options_questions_tab.php:652
-#: includes/qmn_options_questions_tab.php:811
+#: includes/qmn_options_questions_tab.php:812
 msgid "Comment Field"
 msgstr "KOmmentar felt"
 
 #: includes/qmn_options_questions_tab.php:655
-#: includes/qmn_options_questions_tab.php:813
+#: includes/qmn_options_questions_tab.php:814
 msgid "Small Text Field"
 msgstr "Lille tekst felt"
 
 #: includes/qmn_options_questions_tab.php:657
-#: includes/qmn_options_questions_tab.php:814
+#: includes/qmn_options_questions_tab.php:815
 msgid "Large Text Field"
 msgstr "Stort tekst felt"
 
 #: includes/qmn_options_questions_tab.php:659
-#: includes/qmn_options_questions_tab.php:815
+#: includes/qmn_options_questions_tab.php:816
 msgid "None"
 msgstr "Ingen"
 
 #: includes/qmn_options_questions_tab.php:663
 #: includes/qmn_options_questions_tab.php:711
 #: includes/qmn_options_questions_tab.php:722
-#: includes/qmn_options_questions_tab.php:819
+#: includes/qmn_options_questions_tab.php:820
 msgid "Question Order"
 msgstr "Rækkefølge spørgsmål"
 
 #: includes/qmn_options_questions_tab.php:671
-#: includes/qmn_options_questions_tab.php:827
+#: includes/qmn_options_questions_tab.php:828
 msgid "Required?"
 msgstr "Obligatorisk"
 
 #: includes/qmn_options_questions_tab.php:680
 #: includes/qmn_options_questions_tab.php:713
 #: includes/qmn_options_questions_tab.php:724
-#: includes/qmn_options_questions_tab.php:836
+#: includes/qmn_options_questions_tab.php:837
 msgid "Category"
 msgstr "Kategori"
 
 #: includes/qmn_options_questions_tab.php:699
-#: includes/qmn_options_questions_tab.php:855
+#: includes/qmn_options_questions_tab.php:856
 msgid "Required currently only works on open answer, number, accept, and captcha question types"
 msgstr "Obligatorisk virker på nuværende tidspunkt kun på åbne svar, antal, accept og captcha spørgsmål"
 
@@ -797,23 +797,23 @@ msgstr "Obligatorisk virker på nuværende tidspunkt kun på åbne svar, antal,
 msgid "Edit Question"
 msgstr "Ret spørgsmål"
 
-#: includes/qmn_options_questions_tab.php:857
+#: includes/qmn_options_questions_tab.php:858
 msgid "Create Question"
 msgstr "Opret spørgsmål"
 
-#: includes/qmn_options_questions_tab.php:862
+#: includes/qmn_options_questions_tab.php:863
 msgid "Are you sure you want to delete this question?"
 msgstr "Er du sikker på du vil slette dette spørgsmål"
 
-#: includes/qmn_options_questions_tab.php:867
+#: includes/qmn_options_questions_tab.php:868
 msgid "Delete Question"
 msgstr "Slet spørgsmål"
 
-#: includes/qmn_options_questions_tab.php:872
+#: includes/qmn_options_questions_tab.php:873
 msgid "Are you sure you want to duplicate this question?"
 msgstr "Er du sikker på du vil kopiere dette spørgsmål?"
 
-#: includes/qmn_options_questions_tab.php:877
+#: includes/qmn_options_questions_tab.php:878
 msgid "Duplicate Question"
 msgstr "Kopieret spørgsmål"
 
diff --git a/languages/quiz-master-next-es_ES.mo b/languages/quiz-master-next-es_ES.mo
index 5adbfa845..4b972617a 100644
Binary files a/languages/quiz-master-next-es_ES.mo and b/languages/quiz-master-next-es_ES.mo differ
diff --git a/languages/quiz-master-next-es_ES.po b/languages/quiz-master-next-es_ES.po
index 2b1918b71..d61f79202 100644
--- a/languages/quiz-master-next-es_ES.po
+++ b/languages/quiz-master-next-es_ES.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Quiz Master Next\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-25 20:59-0500\n"
-"PO-Revision-Date: 2015-03-25 20:59-0500\n"
+"POT-Creation-Date: 2015-03-31 20:21-0500\n"
+"PO-Revision-Date: 2015-03-31 20:22-0500\n"
 "Last-Translator: Frank Corso <frank@mylocalwebstop.com>\n"
 "Language-Team: My Local Webstop <fpcorso@mylocalwebstop.com>\n"
 "Language: es_ES\n"
@@ -427,16 +427,16 @@ msgid "Leaderboard Template"
 msgstr "Plantilla de clasificación"
 
 #: includes/qmn_options_leaderboard_tab.php:91
-#: includes/qmn_options_text_tab.php:181
-#: includes/qmn_options_text_tab.php:191
-#: includes/qmn_options_text_tab.php:201
-#: includes/qmn_options_text_tab.php:211
-#: includes/qmn_options_text_tab.php:221
-#: includes/qmn_options_text_tab.php:231
-#: includes/qmn_options_text_tab.php:241
-#: includes/qmn_options_text_tab.php:251
-#: includes/qmn_options_text_tab.php:264
-#: includes/qmn_options_text_tab.php:281
+#: includes/qmn_options_text_tab.php:182
+#: includes/qmn_options_text_tab.php:192
+#: includes/qmn_options_text_tab.php:202
+#: includes/qmn_options_text_tab.php:212
+#: includes/qmn_options_text_tab.php:222
+#: includes/qmn_options_text_tab.php:232
+#: includes/qmn_options_text_tab.php:242
+#: includes/qmn_options_text_tab.php:252
+#: includes/qmn_options_text_tab.php:265
+#: includes/qmn_options_text_tab.php:282
 msgid "Allowed Variables:"
 msgstr "Variables permitidas:"
 
@@ -463,88 +463,88 @@ msgstr "Texto"
 msgid "The templates has been updated successfully."
 msgstr "La plantilla ha sido actualizada correctamente."
 
-#: includes/qmn_options_text_tab.php:169
-#: includes/qmn_options_text_tab.php:329
+#: includes/qmn_options_text_tab.php:170
+#: includes/qmn_options_text_tab.php:330
 msgid "Save Templates"
 msgstr "Guardar Plantillas"
 
-#: includes/qmn_options_text_tab.php:175
+#: includes/qmn_options_text_tab.php:176
 msgid "Message Templates"
 msgstr "Plantillas de Mensaje"
 
-#: includes/qmn_options_text_tab.php:179
+#: includes/qmn_options_text_tab.php:180
 msgid "Message Displayed Before Quiz"
 msgstr "Mensaje Mostrado Antes del Cuestionario"
 
-#: includes/qmn_options_text_tab.php:189
+#: includes/qmn_options_text_tab.php:190
 msgid "Message Displayed Before Comments Box If Enabled"
 msgstr "Mensaje Mostrado Antes del campo de Comentarios si está activado."
 
-#: includes/qmn_options_text_tab.php:199
+#: includes/qmn_options_text_tab.php:200
 msgid "Message Displayed At End Of Quiz (Leave Blank To Omit Text Section)"
 msgstr "Mensaje Mostrado al final de la encuesta (Dejar en blanco para omitir sección de texto)"
 
-#: includes/qmn_options_text_tab.php:209
+#: includes/qmn_options_text_tab.php:210
 msgid "Message Displayed If User Has Tried Quiz Too Many Times"
 msgstr "Mensaje Mostrado si el usuario ha intentando entrar demasiadas veces."
 
-#: includes/qmn_options_text_tab.php:219
+#: includes/qmn_options_text_tab.php:220
 msgid "Message Displayed If User Is Not Logged In And Quiz Requires Users To Be Logged In"
 msgstr "Mensaje Mostrado si el usuario no ha iniciado sesión en un cuestionario que requería iniciar sesión."
 
-#: includes/qmn_options_text_tab.php:229
+#: includes/qmn_options_text_tab.php:230
 msgid "Message Displayed If Date Is Outside Scheduled Timeframe"
 msgstr "Mensaje Mostrado si la fecha está fuera del  calendario."
 
-#: includes/qmn_options_text_tab.php:239
+#: includes/qmn_options_text_tab.php:240
 msgid "Message Displayed If The Limit Of Total Entries Has Been Reached"
 msgstr "Mensaje mostrado si el límite total de entradas ha sido superado."
 
-#: includes/qmn_options_text_tab.php:249
+#: includes/qmn_options_text_tab.php:250
 msgid "%QUESTIONS_ANSWERS% Text"
 msgstr "%QUESTIONS_ANSWERS% Texto"
 
-#: includes/qmn_options_text_tab.php:262
+#: includes/qmn_options_text_tab.php:263
 msgid "Twitter Sharing Text"
 msgstr "Texto para compartir en Twitter"
 
-#: includes/qmn_options_text_tab.php:279
+#: includes/qmn_options_text_tab.php:280
 msgid "Facebook Sharing Text"
 msgstr "Texto para compartir en Facebook"
 
-#: includes/qmn_options_text_tab.php:294
+#: includes/qmn_options_text_tab.php:295
 msgid "Other Templates"
 msgstr "Otras plantillas"
 
-#: includes/qmn_options_text_tab.php:297
+#: includes/qmn_options_text_tab.php:298
 msgid "Text for submit button"
 msgstr "Texto para el botón de envío."
 
-#: includes/qmn_options_text_tab.php:301
+#: includes/qmn_options_text_tab.php:302
 msgid "Text for name field"
 msgstr "Texto para el nombre del campo"
 
-#: includes/qmn_options_text_tab.php:305
+#: includes/qmn_options_text_tab.php:306
 msgid "Text for business field"
 msgstr "Texto para el campo asunto."
 
-#: includes/qmn_options_text_tab.php:309
+#: includes/qmn_options_text_tab.php:310
 msgid "Text for email field"
 msgstr "Texto para el campo email"
 
-#: includes/qmn_options_text_tab.php:313
+#: includes/qmn_options_text_tab.php:314
 msgid "Text for phone number field"
 msgstr "Texto para el campo número de teléfono"
 
-#: includes/qmn_options_text_tab.php:317
+#: includes/qmn_options_text_tab.php:318
 msgid "Text for comments field"
 msgstr "Texto para el campo Comentarios"
 
-#: includes/qmn_options_text_tab.php:321
+#: includes/qmn_options_text_tab.php:322
 msgid "Text for previous button"
 msgstr "Texto para el botón Anterior"
 
-#: includes/qmn_options_text_tab.php:325
+#: includes/qmn_options_text_tab.php:326
 msgid "Text for next button"
 msgstr "Texto para el botón Siguiente"
 
@@ -608,40 +608,40 @@ msgstr "El certificado ha sido actualizado correctamente."
 msgid "Enter title here"
 msgstr "Escriba el título aquí"
 
-#: includes/qmn_options_certificate_tab.php:70
+#: includes/qmn_options_certificate_tab.php:65
 msgid "Quiz Certificate (Beta)"
 msgstr "Certificado de encuesta (Beta)"
 
-#: includes/qmn_options_certificate_tab.php:71
+#: includes/qmn_options_certificate_tab.php:66
 msgid "Enter in your text here to fill in the certificate for this quiz. Be sure to enter in the link variable into the templates on the Quiz Text tab so the user can access the certificate."
 msgstr "Escriba aquí el texto que aparecerá como certificado de esta encuesta. Asegúrese de introducir su enlace dentro de las plantillas en la pestaña Quiz Text para que el usuario pueda acceder a su certificado."
 
-#: includes/qmn_options_certificate_tab.php:72
+#: includes/qmn_options_certificate_tab.php:67
 msgid "These fields cannot contain HTML."
 msgstr "Estos campos no pueden contener HTML."
 
-#: includes/qmn_options_certificate_tab.php:73
-#: includes/qmn_options_certificate_tab.php:129
+#: includes/qmn_options_certificate_tab.php:68
+#: includes/qmn_options_certificate_tab.php:124
 msgid "Save Certificate Options"
 msgstr "Guardas Opciones de Certificado"
 
-#: includes/qmn_options_certificate_tab.php:81
+#: includes/qmn_options_certificate_tab.php:76
 msgid "Enable Certificates For This Quiz?"
 msgstr "¿Permitir Certificados para esta Encuesta?"
 
-#: includes/qmn_options_certificate_tab.php:89
+#: includes/qmn_options_certificate_tab.php:84
 msgid "Certificate Title"
 msgstr "Título del certificado"
 
-#: includes/qmn_options_certificate_tab.php:96
+#: includes/qmn_options_certificate_tab.php:91
 msgid "Message Displayed On Certificate"
 msgstr "Mensaje mostrado en el Certificado"
 
-#: includes/qmn_options_certificate_tab.php:116
+#: includes/qmn_options_certificate_tab.php:111
 msgid "URL To Logo (Must be JPG, JPEG, PNG or GIF)"
 msgstr "URL del logo (debe estar en formato JPG, JPEG, PNG o GIF)"
 
-#: includes/qmn_options_certificate_tab.php:123
+#: includes/qmn_options_certificate_tab.php:118
 msgid "URL To Background Img (Must be JPG, JPEG, PNG or GIF)"
 msgstr "URL de la imagen de fondo (debe estar en formato JPG, JPEG, PNG o GIF)"
 
@@ -681,12 +681,12 @@ msgstr "La pregunta ha sido creada correctamente."
 #: includes/qmn_options_questions_tab.php:454
 #: includes/qmn_options_questions_tab.php:461
 #: includes/qmn_options_questions_tab.php:593
-#: includes/qmn_options_questions_tab.php:760
+#: includes/qmn_options_questions_tab.php:761
 msgid "Answer"
 msgstr "Respuesta"
 
 #: includes/qmn_options_questions_tab.php:481
-#: includes/qmn_options_questions_tab.php:729
+#: includes/qmn_options_questions_tab.php:730
 msgid "Add Question"
 msgstr "Añadir pregunta"
 
@@ -711,90 +711,90 @@ msgid "Delete"
 msgstr "Eliminar"
 
 #: includes/qmn_options_questions_tab.php:568
-#: includes/qmn_options_questions_tab.php:737
+#: includes/qmn_options_questions_tab.php:738
 msgid "For fill in the blank types, use %BLANK% to represent where to put the text box in your text."
 msgstr ""
 
 #: includes/qmn_options_questions_tab.php:571
 #: includes/qmn_options_questions_tab.php:714
 #: includes/qmn_options_questions_tab.php:725
-#: includes/qmn_options_questions_tab.php:740
+#: includes/qmn_options_questions_tab.php:741
 msgid "Question"
 msgstr "Pregunta"
 
 #: includes/qmn_options_questions_tab.php:582
-#: includes/qmn_options_questions_tab.php:751
+#: includes/qmn_options_questions_tab.php:752
 msgid "Answers"
 msgstr "Respuestas"
 
 #: includes/qmn_options_questions_tab.php:583
-#: includes/qmn_options_questions_tab.php:752
+#: includes/qmn_options_questions_tab.php:753
 msgid "Points Worth"
 msgstr "Puntuación"
 
 #: includes/qmn_options_questions_tab.php:584
-#: includes/qmn_options_questions_tab.php:753
+#: includes/qmn_options_questions_tab.php:754
 msgid "Correct Answer"
 msgstr "Respuesta correcta"
 
 #: includes/qmn_options_questions_tab.php:611
-#: includes/qmn_options_questions_tab.php:775
+#: includes/qmn_options_questions_tab.php:776
 msgid "Add New Answer!"
 msgstr "Añada nueva respuesta!"
 
 #: includes/qmn_options_questions_tab.php:616
-#: includes/qmn_options_questions_tab.php:780
+#: includes/qmn_options_questions_tab.php:781
 msgid "Correct Answer Info"
 msgstr "Información acerca de la respuesta correcta"
 
 #: includes/qmn_options_questions_tab.php:634
 #: includes/qmn_options_questions_tab.php:712
 #: includes/qmn_options_questions_tab.php:723
-#: includes/qmn_options_questions_tab.php:798
+#: includes/qmn_options_questions_tab.php:799
 msgid "Question Type"
 msgstr "Tipo de pregunta"
 
 #: includes/qmn_options_questions_tab.php:652
-#: includes/qmn_options_questions_tab.php:811
+#: includes/qmn_options_questions_tab.php:812
 msgid "Comment Field"
 msgstr "Campo de Comentario"
 
 #: includes/qmn_options_questions_tab.php:655
-#: includes/qmn_options_questions_tab.php:813
+#: includes/qmn_options_questions_tab.php:814
 msgid "Small Text Field"
 msgstr "Campo de texto corto"
 
 #: includes/qmn_options_questions_tab.php:657
-#: includes/qmn_options_questions_tab.php:814
+#: includes/qmn_options_questions_tab.php:815
 msgid "Large Text Field"
 msgstr "Campo de texto largo"
 
 #: includes/qmn_options_questions_tab.php:659
-#: includes/qmn_options_questions_tab.php:815
+#: includes/qmn_options_questions_tab.php:816
 msgid "None"
 msgstr "Ninguna"
 
 #: includes/qmn_options_questions_tab.php:663
 #: includes/qmn_options_questions_tab.php:711
 #: includes/qmn_options_questions_tab.php:722
-#: includes/qmn_options_questions_tab.php:819
+#: includes/qmn_options_questions_tab.php:820
 msgid "Question Order"
 msgstr "Orden de preguntas"
 
 #: includes/qmn_options_questions_tab.php:671
-#: includes/qmn_options_questions_tab.php:827
+#: includes/qmn_options_questions_tab.php:828
 msgid "Required?"
 msgstr "¿Obligatorio?"
 
 #: includes/qmn_options_questions_tab.php:680
 #: includes/qmn_options_questions_tab.php:713
 #: includes/qmn_options_questions_tab.php:724
-#: includes/qmn_options_questions_tab.php:836
+#: includes/qmn_options_questions_tab.php:837
 msgid "Category"
 msgstr "Categoria"
 
 #: includes/qmn_options_questions_tab.php:699
-#: includes/qmn_options_questions_tab.php:855
+#: includes/qmn_options_questions_tab.php:856
 msgid "Required currently only works on open answer, number, accept, and captcha question types"
 msgstr "Los campos obligatorios tan solo funcionan en respuestas abiertas, números, aceptar y preguntas tipo captcha."
 
@@ -802,23 +802,23 @@ msgstr "Los campos obligatorios tan solo funcionan en respuestas abiertas, núme
 msgid "Edit Question"
 msgstr "Editar Pregunta"
 
-#: includes/qmn_options_questions_tab.php:857
+#: includes/qmn_options_questions_tab.php:858
 msgid "Create Question"
 msgstr "Crear Pregunta"
 
-#: includes/qmn_options_questions_tab.php:862
+#: includes/qmn_options_questions_tab.php:863
 msgid "Are you sure you want to delete this question?"
 msgstr "¿Está seguro que desea eliminar esta pregunta?"
 
-#: includes/qmn_options_questions_tab.php:867
+#: includes/qmn_options_questions_tab.php:868
 msgid "Delete Question"
 msgstr "Eliminar pregunta"
 
-#: includes/qmn_options_questions_tab.php:872
+#: includes/qmn_options_questions_tab.php:873
 msgid "Are you sure you want to duplicate this question?"
 msgstr "¿Está seguro que desea duplicar esta pregunta?"
 
-#: includes/qmn_options_questions_tab.php:877
+#: includes/qmn_options_questions_tab.php:878
 msgid "Duplicate Question"
 msgstr "Duplicar Pregunta"
 
diff --git a/languages/quiz-master-next-it_IT.mo b/languages/quiz-master-next-it_IT.mo
index c50d28500..88d97242c 100644
Binary files a/languages/quiz-master-next-it_IT.mo and b/languages/quiz-master-next-it_IT.mo differ
diff --git a/languages/quiz-master-next-it_IT.po b/languages/quiz-master-next-it_IT.po
index 09dee4ea4..81750d381 100644
--- a/languages/quiz-master-next-it_IT.po
+++ b/languages/quiz-master-next-it_IT.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Quiz Master Next\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-25 21:00-0500\n"
+"POT-Creation-Date: 2015-03-31 20:22-0500\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Frank Corso <frank@mylocalwebstop.com>\n"
 "Language-Team: My Local Webstop <fpcorso@mylocalwebstop.com>\n"
@@ -425,16 +425,16 @@ msgid "Leaderboard Template"
 msgstr "Template Classifica"
 
 #: includes/qmn_options_leaderboard_tab.php:91
-#: includes/qmn_options_text_tab.php:181
-#: includes/qmn_options_text_tab.php:191
-#: includes/qmn_options_text_tab.php:201
-#: includes/qmn_options_text_tab.php:211
-#: includes/qmn_options_text_tab.php:221
-#: includes/qmn_options_text_tab.php:231
-#: includes/qmn_options_text_tab.php:241
-#: includes/qmn_options_text_tab.php:251
-#: includes/qmn_options_text_tab.php:264
-#: includes/qmn_options_text_tab.php:281
+#: includes/qmn_options_text_tab.php:182
+#: includes/qmn_options_text_tab.php:192
+#: includes/qmn_options_text_tab.php:202
+#: includes/qmn_options_text_tab.php:212
+#: includes/qmn_options_text_tab.php:222
+#: includes/qmn_options_text_tab.php:232
+#: includes/qmn_options_text_tab.php:242
+#: includes/qmn_options_text_tab.php:252
+#: includes/qmn_options_text_tab.php:265
+#: includes/qmn_options_text_tab.php:282
 msgid "Allowed Variables:"
 msgstr "Variabili Consentite:"
 
@@ -458,88 +458,88 @@ msgstr "Testo"
 msgid "The templates has been updated successfully."
 msgstr "I template sono stati aggiornati con successo."
 
-#: includes/qmn_options_text_tab.php:169
-#: includes/qmn_options_text_tab.php:329
+#: includes/qmn_options_text_tab.php:170
+#: includes/qmn_options_text_tab.php:330
 msgid "Save Templates"
 msgstr "Salva Template"
 
-#: includes/qmn_options_text_tab.php:175
+#: includes/qmn_options_text_tab.php:176
 msgid "Message Templates"
 msgstr "Messaggio Template"
 
-#: includes/qmn_options_text_tab.php:179
+#: includes/qmn_options_text_tab.php:180
 msgid "Message Displayed Before Quiz"
 msgstr "Messaggio Mostrato Prima del Quiz"
 
-#: includes/qmn_options_text_tab.php:189
+#: includes/qmn_options_text_tab.php:190
 msgid "Message Displayed Before Comments Box If Enabled"
 msgstr "Messaggio Mostrato Prima Del Box Commenti (se attivo)"
 
-#: includes/qmn_options_text_tab.php:199
+#: includes/qmn_options_text_tab.php:200
 msgid "Message Displayed At End Of Quiz (Leave Blank To Omit Text Section)"
 msgstr "Messaggio Mostrato Alla Fine Del Quiz (lascia vuoto per omettere la sezione testo)"
 
-#: includes/qmn_options_text_tab.php:209
+#: includes/qmn_options_text_tab.php:210
 msgid "Message Displayed If User Has Tried Quiz Too Many Times"
 msgstr "Messaggio Mostrato Se l'Utente Ha Provato Il Quiz Troppe Volte"
 
-#: includes/qmn_options_text_tab.php:219
+#: includes/qmn_options_text_tab.php:220
 msgid "Message Displayed If User Is Not Logged In And Quiz Requires Users To Be Logged In"
 msgstr "Messaggio Mostrato Se l'Utente Non E' Loggato E Il Quiz Richiede Che Lo Sia"
 
-#: includes/qmn_options_text_tab.php:229
+#: includes/qmn_options_text_tab.php:230
 msgid "Message Displayed If Date Is Outside Scheduled Timeframe"
 msgstr "Messaggio Mostrato Se La Data E' Fuori Dall'Intervallo Previsto"
 
-#: includes/qmn_options_text_tab.php:239
+#: includes/qmn_options_text_tab.php:240
 msgid "Message Displayed If The Limit Of Total Entries Has Been Reached"
 msgstr "Messaggio Mostrato Se Viene Raggiunto Il Limite Delle Voci Totali"
 
-#: includes/qmn_options_text_tab.php:249
+#: includes/qmn_options_text_tab.php:250
 msgid "%QUESTIONS_ANSWERS% Text"
 msgstr "%QUESTIONS_ANSWERS% Testo"
 
-#: includes/qmn_options_text_tab.php:262
+#: includes/qmn_options_text_tab.php:263
 msgid "Twitter Sharing Text"
 msgstr "Testo Di Condivisione Su Twitter"
 
-#: includes/qmn_options_text_tab.php:279
+#: includes/qmn_options_text_tab.php:280
 msgid "Facebook Sharing Text"
 msgstr "Testo di Condivisione Su Facebook"
 
-#: includes/qmn_options_text_tab.php:294
+#: includes/qmn_options_text_tab.php:295
 msgid "Other Templates"
 msgstr "Altri Template"
 
-#: includes/qmn_options_text_tab.php:297
+#: includes/qmn_options_text_tab.php:298
 msgid "Text for submit button"
 msgstr "Testo per il pulsante di invio"
 
-#: includes/qmn_options_text_tab.php:301
+#: includes/qmn_options_text_tab.php:302
 msgid "Text for name field"
 msgstr "Testo per il campo del nome"
 
-#: includes/qmn_options_text_tab.php:305
+#: includes/qmn_options_text_tab.php:306
 msgid "Text for business field"
 msgstr "Testo per il campo dell'azienda"
 
-#: includes/qmn_options_text_tab.php:309
+#: includes/qmn_options_text_tab.php:310
 msgid "Text for email field"
 msgstr "Testo per il campo dell'email"
 
-#: includes/qmn_options_text_tab.php:313
+#: includes/qmn_options_text_tab.php:314
 msgid "Text for phone number field"
 msgstr "Testo per il campo del telefono"
 
-#: includes/qmn_options_text_tab.php:317
+#: includes/qmn_options_text_tab.php:318
 msgid "Text for comments field"
 msgstr "Testo per il campo commenti"
 
-#: includes/qmn_options_text_tab.php:321
+#: includes/qmn_options_text_tab.php:322
 msgid "Text for previous button"
 msgstr "Testo per il pulsante \"precedente\""
 
-#: includes/qmn_options_text_tab.php:325
+#: includes/qmn_options_text_tab.php:326
 msgid "Text for next button"
 msgstr "Testo per il pulsante \"successivo\""
 
@@ -603,40 +603,40 @@ msgstr "Il certificato è stato aggiornato con successo."
 msgid "Enter title here"
 msgstr "Inserisci qui un titolo"
 
-#: includes/qmn_options_certificate_tab.php:70
+#: includes/qmn_options_certificate_tab.php:65
 msgid "Quiz Certificate (Beta)"
 msgstr "Certificato del Quiz (Beta)"
 
-#: includes/qmn_options_certificate_tab.php:71
+#: includes/qmn_options_certificate_tab.php:66
 msgid "Enter in your text here to fill in the certificate for this quiz. Be sure to enter in the link variable into the templates on the Quiz Text tab so the user can access the certificate."
 msgstr "Inserisci qui il testo per compilare il certificato di questo quiz. Assicurati di inserire la variabile del link nel template nella sezione Testo Quiz, in modo che l'utente possa accedere al certificato."
 
-#: includes/qmn_options_certificate_tab.php:72
+#: includes/qmn_options_certificate_tab.php:67
 msgid "These fields cannot contain HTML."
 msgstr "Questi campi non possono contenere HTML."
 
-#: includes/qmn_options_certificate_tab.php:73
-#: includes/qmn_options_certificate_tab.php:129
+#: includes/qmn_options_certificate_tab.php:68
+#: includes/qmn_options_certificate_tab.php:124
 msgid "Save Certificate Options"
 msgstr "Salva Opzioni Certificato"
 
-#: includes/qmn_options_certificate_tab.php:81
+#: includes/qmn_options_certificate_tab.php:76
 msgid "Enable Certificates For This Quiz?"
 msgstr "Attiva i Certificati per Questo Quiz?"
 
-#: includes/qmn_options_certificate_tab.php:89
+#: includes/qmn_options_certificate_tab.php:84
 msgid "Certificate Title"
 msgstr "Titolo Certificato"
 
-#: includes/qmn_options_certificate_tab.php:96
+#: includes/qmn_options_certificate_tab.php:91
 msgid "Message Displayed On Certificate"
 msgstr "Messaggio Mostrato nel Certificato"
 
-#: includes/qmn_options_certificate_tab.php:116
+#: includes/qmn_options_certificate_tab.php:111
 msgid "URL To Logo (Must be JPG, JPEG, PNG or GIF)"
 msgstr "URL al Logo (deve essere JPG, JPEG, PNG o GIF)"
 
-#: includes/qmn_options_certificate_tab.php:123
+#: includes/qmn_options_certificate_tab.php:118
 msgid "URL To Background Img (Must be JPG, JPEG, PNG or GIF)"
 msgstr "URL all'Immagine di Sfondo (deve Essere JPG, JPEG, PNG, GIF)"
 
@@ -676,12 +676,12 @@ msgstr "La domanda è stata creata con successo."
 #: includes/qmn_options_questions_tab.php:454
 #: includes/qmn_options_questions_tab.php:461
 #: includes/qmn_options_questions_tab.php:593
-#: includes/qmn_options_questions_tab.php:760
+#: includes/qmn_options_questions_tab.php:761
 msgid "Answer"
 msgstr "Risposta"
 
 #: includes/qmn_options_questions_tab.php:481
-#: includes/qmn_options_questions_tab.php:729
+#: includes/qmn_options_questions_tab.php:730
 msgid "Add Question"
 msgstr "Aggiungi Domanda"
 
@@ -706,90 +706,90 @@ msgid "Delete"
 msgstr "Cancella"
 
 #: includes/qmn_options_questions_tab.php:568
-#: includes/qmn_options_questions_tab.php:737
+#: includes/qmn_options_questions_tab.php:738
 msgid "For fill in the blank types, use %BLANK% to represent where to put the text box in your text."
 msgstr ""
 
 #: includes/qmn_options_questions_tab.php:571
 #: includes/qmn_options_questions_tab.php:714
 #: includes/qmn_options_questions_tab.php:725
-#: includes/qmn_options_questions_tab.php:740
+#: includes/qmn_options_questions_tab.php:741
 msgid "Question"
 msgstr "Domanda"
 
 #: includes/qmn_options_questions_tab.php:582
-#: includes/qmn_options_questions_tab.php:751
+#: includes/qmn_options_questions_tab.php:752
 msgid "Answers"
 msgstr "Risposte"
 
 #: includes/qmn_options_questions_tab.php:583
-#: includes/qmn_options_questions_tab.php:752
+#: includes/qmn_options_questions_tab.php:753
 msgid "Points Worth"
 msgstr "Valore in Punti"
 
 #: includes/qmn_options_questions_tab.php:584
-#: includes/qmn_options_questions_tab.php:753
+#: includes/qmn_options_questions_tab.php:754
 msgid "Correct Answer"
 msgstr "Risposta Corretta"
 
 #: includes/qmn_options_questions_tab.php:611
-#: includes/qmn_options_questions_tab.php:775
+#: includes/qmn_options_questions_tab.php:776
 msgid "Add New Answer!"
 msgstr "Aggiungi una Nuova Risposta!"
 
 #: includes/qmn_options_questions_tab.php:616
-#: includes/qmn_options_questions_tab.php:780
+#: includes/qmn_options_questions_tab.php:781
 msgid "Correct Answer Info"
 msgstr "Informazioni Risposta Corretta"
 
 #: includes/qmn_options_questions_tab.php:634
 #: includes/qmn_options_questions_tab.php:712
 #: includes/qmn_options_questions_tab.php:723
-#: includes/qmn_options_questions_tab.php:798
+#: includes/qmn_options_questions_tab.php:799
 msgid "Question Type"
 msgstr "Tipo di Domanda"
 
 #: includes/qmn_options_questions_tab.php:652
-#: includes/qmn_options_questions_tab.php:811
+#: includes/qmn_options_questions_tab.php:812
 msgid "Comment Field"
 msgstr "Campo Commenti"
 
 #: includes/qmn_options_questions_tab.php:655
-#: includes/qmn_options_questions_tab.php:813
+#: includes/qmn_options_questions_tab.php:814
 msgid "Small Text Field"
 msgstr "Campo Testo Piccolo"
 
 #: includes/qmn_options_questions_tab.php:657
-#: includes/qmn_options_questions_tab.php:814
+#: includes/qmn_options_questions_tab.php:815
 msgid "Large Text Field"
 msgstr "Campo Testo Grande"
 
 #: includes/qmn_options_questions_tab.php:659
-#: includes/qmn_options_questions_tab.php:815
+#: includes/qmn_options_questions_tab.php:816
 msgid "None"
 msgstr "No"
 
 #: includes/qmn_options_questions_tab.php:663
 #: includes/qmn_options_questions_tab.php:711
 #: includes/qmn_options_questions_tab.php:722
-#: includes/qmn_options_questions_tab.php:819
+#: includes/qmn_options_questions_tab.php:820
 msgid "Question Order"
 msgstr "Ordine Domanda"
 
 #: includes/qmn_options_questions_tab.php:671
-#: includes/qmn_options_questions_tab.php:827
+#: includes/qmn_options_questions_tab.php:828
 msgid "Required?"
 msgstr "Obbligatoria?"
 
 #: includes/qmn_options_questions_tab.php:680
 #: includes/qmn_options_questions_tab.php:713
 #: includes/qmn_options_questions_tab.php:724
-#: includes/qmn_options_questions_tab.php:836
+#: includes/qmn_options_questions_tab.php:837
 msgid "Category"
 msgstr "Categoria"
 
 #: includes/qmn_options_questions_tab.php:699
-#: includes/qmn_options_questions_tab.php:855
+#: includes/qmn_options_questions_tab.php:856
 msgid "Required currently only works on open answer, number, accept, and captcha question types"
 msgstr "La specifica \"Obbligatoria\" attualmente funziona solo per domande a risposta aperta, numeriche, da spuntare e captcha"
 
@@ -797,23 +797,23 @@ msgstr "La specifica \"Obbligatoria\" attualmente funziona solo per domande a ri
 msgid "Edit Question"
 msgstr "Modifica Domanda"
 
-#: includes/qmn_options_questions_tab.php:857
+#: includes/qmn_options_questions_tab.php:858
 msgid "Create Question"
 msgstr "Crea Una Domanda"
 
-#: includes/qmn_options_questions_tab.php:862
+#: includes/qmn_options_questions_tab.php:863
 msgid "Are you sure you want to delete this question?"
 msgstr "Sei sicuro di voler cancellare questa domanda?"
 
-#: includes/qmn_options_questions_tab.php:867
+#: includes/qmn_options_questions_tab.php:868
 msgid "Delete Question"
 msgstr "Cancella Domanda"
 
-#: includes/qmn_options_questions_tab.php:872
+#: includes/qmn_options_questions_tab.php:873
 msgid "Are you sure you want to duplicate this question?"
 msgstr "Sei sicuro di voler duplicare questa domanda?"
 
-#: includes/qmn_options_questions_tab.php:877
+#: includes/qmn_options_questions_tab.php:878
 msgid "Duplicate Question"
 msgstr "Duplica Domanda"
 
diff --git a/languages/quiz-master-next-nl-NL.mo b/languages/quiz-master-next-nl-NL.mo
index 5a30e1770..137393d70 100644
Binary files a/languages/quiz-master-next-nl-NL.mo and b/languages/quiz-master-next-nl-NL.mo differ
diff --git a/languages/quiz-master-next-nl-NL.po b/languages/quiz-master-next-nl-NL.po
index f7a1d49cf..4f51c378d 100644
--- a/languages/quiz-master-next-nl-NL.po
+++ b/languages/quiz-master-next-nl-NL.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Quiz Master Next\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-25 21:00-0500\n"
+"POT-Creation-Date: 2015-03-31 20:22-0500\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Frank Corso <frank@mylocalwebstop.com>\n"
 "Language-Team: My Local Webstop <fpcorso@mylocalwebstop.com>\n"
@@ -425,16 +425,16 @@ msgid "Leaderboard Template"
 msgstr "Klassement template"
 
 #: includes/qmn_options_leaderboard_tab.php:91
-#: includes/qmn_options_text_tab.php:181
-#: includes/qmn_options_text_tab.php:191
-#: includes/qmn_options_text_tab.php:201
-#: includes/qmn_options_text_tab.php:211
-#: includes/qmn_options_text_tab.php:221
-#: includes/qmn_options_text_tab.php:231
-#: includes/qmn_options_text_tab.php:241
-#: includes/qmn_options_text_tab.php:251
-#: includes/qmn_options_text_tab.php:264
-#: includes/qmn_options_text_tab.php:281
+#: includes/qmn_options_text_tab.php:182
+#: includes/qmn_options_text_tab.php:192
+#: includes/qmn_options_text_tab.php:202
+#: includes/qmn_options_text_tab.php:212
+#: includes/qmn_options_text_tab.php:222
+#: includes/qmn_options_text_tab.php:232
+#: includes/qmn_options_text_tab.php:242
+#: includes/qmn_options_text_tab.php:252
+#: includes/qmn_options_text_tab.php:265
+#: includes/qmn_options_text_tab.php:282
 msgid "Allowed Variables:"
 msgstr "Toegestane variabelen:"
 
@@ -458,88 +458,88 @@ msgstr "Tekst"
 msgid "The templates has been updated successfully."
 msgstr "De templates zijn succesvol opgeslagen."
 
-#: includes/qmn_options_text_tab.php:169
-#: includes/qmn_options_text_tab.php:329
+#: includes/qmn_options_text_tab.php:170
+#: includes/qmn_options_text_tab.php:330
 msgid "Save Templates"
 msgstr "Bewaar teplates"
 
-#: includes/qmn_options_text_tab.php:175
+#: includes/qmn_options_text_tab.php:176
 msgid "Message Templates"
 msgstr "Bericht templates"
 
-#: includes/qmn_options_text_tab.php:179
+#: includes/qmn_options_text_tab.php:180
 msgid "Message Displayed Before Quiz"
 msgstr "Bericht getoond voor aanvang quiz"
 
-#: includes/qmn_options_text_tab.php:189
+#: includes/qmn_options_text_tab.php:190
 msgid "Message Displayed Before Comments Box If Enabled"
 msgstr "Bericht getoond voor opmerkingen box indien ingeschakeld"
 
-#: includes/qmn_options_text_tab.php:199
+#: includes/qmn_options_text_tab.php:200
 msgid "Message Displayed At End Of Quiz (Leave Blank To Omit Text Section)"
 msgstr "Bericht getoond aan het einde van de quiz (Laat leeg om de tekst sectie weg te laten)"
 
-#: includes/qmn_options_text_tab.php:209
+#: includes/qmn_options_text_tab.php:210
 msgid "Message Displayed If User Has Tried Quiz Too Many Times"
 msgstr "Bericht getoond indien de gebruiker de quiz te vaak heeft proberen te maken"
 
-#: includes/qmn_options_text_tab.php:219
+#: includes/qmn_options_text_tab.php:220
 msgid "Message Displayed If User Is Not Logged In And Quiz Requires Users To Be Logged In"
 msgstr "Bericht getoond indien de gebruiker niet is ingelogd en de quiz dit wel vereist"
 
-#: includes/qmn_options_text_tab.php:229
+#: includes/qmn_options_text_tab.php:230
 msgid "Message Displayed If Date Is Outside Scheduled Timeframe"
 msgstr "Bericht getoond indien de datum buiten het tijdspad is"
 
-#: includes/qmn_options_text_tab.php:239
+#: includes/qmn_options_text_tab.php:240
 msgid "Message Displayed If The Limit Of Total Entries Has Been Reached"
 msgstr "Bericht getoond indien de grens van het aantal invoeren is bereikt"
 
-#: includes/qmn_options_text_tab.php:249
+#: includes/qmn_options_text_tab.php:250
 msgid "%QUESTIONS_ANSWERS% Text"
 msgstr "%QUESTIONS_ANSWERS% Tekst"
 
-#: includes/qmn_options_text_tab.php:262
+#: includes/qmn_options_text_tab.php:263
 msgid "Twitter Sharing Text"
 msgstr "Twitter Delen tekst"
 
-#: includes/qmn_options_text_tab.php:279
+#: includes/qmn_options_text_tab.php:280
 msgid "Facebook Sharing Text"
 msgstr "Facebook Delen tekst"
 
-#: includes/qmn_options_text_tab.php:294
+#: includes/qmn_options_text_tab.php:295
 msgid "Other Templates"
 msgstr "Andere templates"
 
-#: includes/qmn_options_text_tab.php:297
+#: includes/qmn_options_text_tab.php:298
 msgid "Text for submit button"
 msgstr "Teskt voor verstuur knop"
 
-#: includes/qmn_options_text_tab.php:301
+#: includes/qmn_options_text_tab.php:302
 msgid "Text for name field"
 msgstr "Tekst voor naam veld"
 
-#: includes/qmn_options_text_tab.php:305
+#: includes/qmn_options_text_tab.php:306
 msgid "Text for business field"
 msgstr "Tekst voor bedrijfsveld"
 
-#: includes/qmn_options_text_tab.php:309
+#: includes/qmn_options_text_tab.php:310
 msgid "Text for email field"
 msgstr "Tekst voor email veld"
 
-#: includes/qmn_options_text_tab.php:313
+#: includes/qmn_options_text_tab.php:314
 msgid "Text for phone number field"
 msgstr "Tekst voor telefoonnummer veld"
 
-#: includes/qmn_options_text_tab.php:317
+#: includes/qmn_options_text_tab.php:318
 msgid "Text for comments field"
 msgstr "Tekst voor opmerkingen veld"
 
-#: includes/qmn_options_text_tab.php:321
+#: includes/qmn_options_text_tab.php:322
 msgid "Text for previous button"
 msgstr "Tekst voor vorige knop"
 
-#: includes/qmn_options_text_tab.php:325
+#: includes/qmn_options_text_tab.php:326
 msgid "Text for next button"
 msgstr "Tekst voor volgende knop"
 
@@ -603,40 +603,40 @@ msgstr "Het certificaat werd succesvol bijgewerkt."
 msgid "Enter title here"
 msgstr "Hier titel invoeren"
 
-#: includes/qmn_options_certificate_tab.php:70
+#: includes/qmn_options_certificate_tab.php:65
 msgid "Quiz Certificate (Beta)"
 msgstr "Quiz Certificaat (Beta)"
 
-#: includes/qmn_options_certificate_tab.php:71
+#: includes/qmn_options_certificate_tab.php:66
 msgid "Enter in your text here to fill in the certificate for this quiz. Be sure to enter in the link variable into the templates on the Quiz Text tab so the user can access the certificate."
 msgstr "Voer hier je tekst in voor het certificaat van deze quiz. Let er op om de linkvariabele in te voeren in de templates op de Quiz Next tab zodat de gebruiker toegang heeft tot het certificaat."
 
-#: includes/qmn_options_certificate_tab.php:72
+#: includes/qmn_options_certificate_tab.php:67
 msgid "These fields cannot contain HTML."
 msgstr "Deze velden kunnen geen HTML bevatten."
 
-#: includes/qmn_options_certificate_tab.php:73
-#: includes/qmn_options_certificate_tab.php:129
+#: includes/qmn_options_certificate_tab.php:68
+#: includes/qmn_options_certificate_tab.php:124
 msgid "Save Certificate Options"
 msgstr "Bewaar certificaat opties"
 
-#: includes/qmn_options_certificate_tab.php:81
+#: includes/qmn_options_certificate_tab.php:76
 msgid "Enable Certificates For This Quiz?"
 msgstr "Certificaat toestaan voor deze quiz?"
 
-#: includes/qmn_options_certificate_tab.php:89
+#: includes/qmn_options_certificate_tab.php:84
 msgid "Certificate Title"
 msgstr "Certificaat titel"
 
-#: includes/qmn_options_certificate_tab.php:96
+#: includes/qmn_options_certificate_tab.php:91
 msgid "Message Displayed On Certificate"
 msgstr "Bericht dat op certificaat staat"
 
-#: includes/qmn_options_certificate_tab.php:116
+#: includes/qmn_options_certificate_tab.php:111
 msgid "URL To Logo (Must be JPG, JPEG, PNG or GIF)"
 msgstr "URL naar logo (moet JPG, JPEG, PNG of GIF zijn)"
 
-#: includes/qmn_options_certificate_tab.php:123
+#: includes/qmn_options_certificate_tab.php:118
 msgid "URL To Background Img (Must be JPG, JPEG, PNG or GIF)"
 msgstr "URL naar achtergrond Img (moet JPG, JPEG, PNG of GIF zijn)"
 
@@ -676,12 +676,12 @@ msgstr "De vraag is succesvol gemaakt."
 #: includes/qmn_options_questions_tab.php:454
 #: includes/qmn_options_questions_tab.php:461
 #: includes/qmn_options_questions_tab.php:593
-#: includes/qmn_options_questions_tab.php:760
+#: includes/qmn_options_questions_tab.php:761
 msgid "Answer"
 msgstr "Antwoord"
 
 #: includes/qmn_options_questions_tab.php:481
-#: includes/qmn_options_questions_tab.php:729
+#: includes/qmn_options_questions_tab.php:730
 msgid "Add Question"
 msgstr "Vraag toevoegen"
 
@@ -706,90 +706,90 @@ msgid "Delete"
 msgstr "Verwijder"
 
 #: includes/qmn_options_questions_tab.php:568
-#: includes/qmn_options_questions_tab.php:737
+#: includes/qmn_options_questions_tab.php:738
 msgid "For fill in the blank types, use %BLANK% to represent where to put the text box in your text."
 msgstr "Voor vul het lege veld in types, gebruik %BLANK% om aan te geven waar je in je tekst de tekstbox wil hebben."
 
 #: includes/qmn_options_questions_tab.php:571
 #: includes/qmn_options_questions_tab.php:714
 #: includes/qmn_options_questions_tab.php:725
-#: includes/qmn_options_questions_tab.php:740
+#: includes/qmn_options_questions_tab.php:741
 msgid "Question"
 msgstr "Vraag"
 
 #: includes/qmn_options_questions_tab.php:582
-#: includes/qmn_options_questions_tab.php:751
+#: includes/qmn_options_questions_tab.php:752
 msgid "Answers"
 msgstr "Antwoorden"
 
 #: includes/qmn_options_questions_tab.php:583
-#: includes/qmn_options_questions_tab.php:752
+#: includes/qmn_options_questions_tab.php:753
 msgid "Points Worth"
 msgstr "Punten waard"
 
 #: includes/qmn_options_questions_tab.php:584
-#: includes/qmn_options_questions_tab.php:753
+#: includes/qmn_options_questions_tab.php:754
 msgid "Correct Answer"
 msgstr "Goed antwoord"
 
 #: includes/qmn_options_questions_tab.php:611
-#: includes/qmn_options_questions_tab.php:775
+#: includes/qmn_options_questions_tab.php:776
 msgid "Add New Answer!"
 msgstr "Voeg nieuw antwoord toe!"
 
 #: includes/qmn_options_questions_tab.php:616
-#: includes/qmn_options_questions_tab.php:780
+#: includes/qmn_options_questions_tab.php:781
 msgid "Correct Answer Info"
 msgstr "Juiste antwoord informatie"
 
 #: includes/qmn_options_questions_tab.php:634
 #: includes/qmn_options_questions_tab.php:712
 #: includes/qmn_options_questions_tab.php:723
-#: includes/qmn_options_questions_tab.php:798
+#: includes/qmn_options_questions_tab.php:799
 msgid "Question Type"
 msgstr "Vraag type"
 
 #: includes/qmn_options_questions_tab.php:652
-#: includes/qmn_options_questions_tab.php:811
+#: includes/qmn_options_questions_tab.php:812
 msgid "Comment Field"
 msgstr "Opmerkingenveld"
 
 #: includes/qmn_options_questions_tab.php:655
-#: includes/qmn_options_questions_tab.php:813
+#: includes/qmn_options_questions_tab.php:814
 msgid "Small Text Field"
 msgstr "Klein tekstveld"
 
 #: includes/qmn_options_questions_tab.php:657
-#: includes/qmn_options_questions_tab.php:814
+#: includes/qmn_options_questions_tab.php:815
 msgid "Large Text Field"
 msgstr "Groot tekstveld"
 
 #: includes/qmn_options_questions_tab.php:659
-#: includes/qmn_options_questions_tab.php:815
+#: includes/qmn_options_questions_tab.php:816
 msgid "None"
 msgstr "Geen"
 
 #: includes/qmn_options_questions_tab.php:663
 #: includes/qmn_options_questions_tab.php:711
 #: includes/qmn_options_questions_tab.php:722
-#: includes/qmn_options_questions_tab.php:819
+#: includes/qmn_options_questions_tab.php:820
 msgid "Question Order"
 msgstr "Vraag volgorde"
 
 #: includes/qmn_options_questions_tab.php:671
-#: includes/qmn_options_questions_tab.php:827
+#: includes/qmn_options_questions_tab.php:828
 msgid "Required?"
 msgstr "Vereist?"
 
 #: includes/qmn_options_questions_tab.php:680
 #: includes/qmn_options_questions_tab.php:713
 #: includes/qmn_options_questions_tab.php:724
-#: includes/qmn_options_questions_tab.php:836
+#: includes/qmn_options_questions_tab.php:837
 msgid "Category"
 msgstr "Categorie"
 
 #: includes/qmn_options_questions_tab.php:699
-#: includes/qmn_options_questions_tab.php:855
+#: includes/qmn_options_questions_tab.php:856
 msgid "Required currently only works on open answer, number, accept, and captcha question types"
 msgstr "Vereist werkt momenteel alleen op open antwoorden, nummer, accepteer en captcha type vragen"
 
@@ -797,23 +797,23 @@ msgstr "Vereist werkt momenteel alleen op open antwoorden, nummer, accepteer en
 msgid "Edit Question"
 msgstr "Bewerk vraag"
 
-#: includes/qmn_options_questions_tab.php:857
+#: includes/qmn_options_questions_tab.php:858
 msgid "Create Question"
 msgstr "Maak vraag"
 
-#: includes/qmn_options_questions_tab.php:862
+#: includes/qmn_options_questions_tab.php:863
 msgid "Are you sure you want to delete this question?"
 msgstr "Weet je zeker dat je deze vraag wil verwijderen?"
 
-#: includes/qmn_options_questions_tab.php:867
+#: includes/qmn_options_questions_tab.php:868
 msgid "Delete Question"
 msgstr "Verwijder vraag"
 
-#: includes/qmn_options_questions_tab.php:872
+#: includes/qmn_options_questions_tab.php:873
 msgid "Are you sure you want to duplicate this question?"
 msgstr "Weet je zeker dat je deze vraag wil dupliceren?"
 
-#: includes/qmn_options_questions_tab.php:877
+#: includes/qmn_options_questions_tab.php:878
 msgid "Duplicate Question"
 msgstr "Dupliceer vraag"
 
diff --git a/languages/quiz-master-next-pt_BR.mo b/languages/quiz-master-next-pt_BR.mo
index e15e5db9a..6d1ab8185 100644
Binary files a/languages/quiz-master-next-pt_BR.mo and b/languages/quiz-master-next-pt_BR.mo differ
diff --git a/languages/quiz-master-next-pt_BR.po b/languages/quiz-master-next-pt_BR.po
index df731ecce..a2e784ac2 100644
--- a/languages/quiz-master-next-pt_BR.po
+++ b/languages/quiz-master-next-pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Quiz Master Next\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-25 21:01-0500\n"
+"POT-Creation-Date: 2015-03-31 20:22-0500\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Frank Corso <frank@mylocalwebstop.com>\n"
 "Language-Team: \n"
@@ -427,16 +427,16 @@ msgid "Leaderboard Template"
 msgstr "Modelos de Classificação"
 
 #: ../includes/qmn_options_leaderboard_tab.php:91
-#: ../includes/qmn_options_text_tab.php:181
-#: ../includes/qmn_options_text_tab.php:191
-#: ../includes/qmn_options_text_tab.php:201
-#: ../includes/qmn_options_text_tab.php:211
-#: ../includes/qmn_options_text_tab.php:221
-#: ../includes/qmn_options_text_tab.php:231
-#: ../includes/qmn_options_text_tab.php:241
-#: ../includes/qmn_options_text_tab.php:251
-#: ../includes/qmn_options_text_tab.php:264
-#: ../includes/qmn_options_text_tab.php:281
+#: ../includes/qmn_options_text_tab.php:182
+#: ../includes/qmn_options_text_tab.php:192
+#: ../includes/qmn_options_text_tab.php:202
+#: ../includes/qmn_options_text_tab.php:212
+#: ../includes/qmn_options_text_tab.php:222
+#: ../includes/qmn_options_text_tab.php:232
+#: ../includes/qmn_options_text_tab.php:242
+#: ../includes/qmn_options_text_tab.php:252
+#: ../includes/qmn_options_text_tab.php:265
+#: ../includes/qmn_options_text_tab.php:282
 msgid "Allowed Variables:"
 msgstr "Variaveis Mantidas:"
 
@@ -460,88 +460,88 @@ msgstr "texto"
 msgid "The templates has been updated successfully."
 msgstr "Os modelos foram atualizados com sucesso"
 
-#: ../includes/qmn_options_text_tab.php:169
-#: ../includes/qmn_options_text_tab.php:329
+#: ../includes/qmn_options_text_tab.php:170
+#: ../includes/qmn_options_text_tab.php:330
 msgid "Save Templates"
 msgstr "Salvar modelos"
 
-#: ../includes/qmn_options_text_tab.php:175
+#: ../includes/qmn_options_text_tab.php:176
 msgid "Message Templates"
 msgstr "Modelos de mensagens"
 
-#: ../includes/qmn_options_text_tab.php:179
+#: ../includes/qmn_options_text_tab.php:180
 msgid "Message Displayed Before Quiz"
 msgstr "Mensagem exibida antes do questionário"
 
-#: ../includes/qmn_options_text_tab.php:189
+#: ../includes/qmn_options_text_tab.php:190
 msgid "Message Displayed Before Comments Box If Enabled"
 msgstr "Mensagem exibida  antes, se a caixa de comentários estiver ativa"
 
-#: ../includes/qmn_options_text_tab.php:199
+#: ../includes/qmn_options_text_tab.php:200
 msgid "Message Displayed At End Of Quiz (Leave Blank To Omit Text Section)"
 msgstr "Mensagem exibida ao encerrar a avaliação (Deixe em branco para omitir esta seção)"
 
-#: ../includes/qmn_options_text_tab.php:209
+#: ../includes/qmn_options_text_tab.php:210
 msgid "Message Displayed If User Has Tried Quiz Too Many Times"
 msgstr "Mensagem exibida se usuário tentar questionário várias vezes"
 
-#: ../includes/qmn_options_text_tab.php:219
+#: ../includes/qmn_options_text_tab.php:220
 msgid "Message Displayed If User Is Not Logged In And Quiz Requires Users To Be Logged In"
 msgstr "Mensagem exibida Se o usuário não está logado e o Questionário requerer que os usuários devam estar conectados"
 
-#: ../includes/qmn_options_text_tab.php:229
+#: ../includes/qmn_options_text_tab.php:230
 msgid "Message Displayed If Date Is Outside Scheduled Timeframe"
 msgstr "Mensagem exibida quando a data está fora do tempo programado"
 
-#: ../includes/qmn_options_text_tab.php:239
+#: ../includes/qmn_options_text_tab.php:240
 msgid "Message Displayed If The Limit Of Total Entries Has Been Reached"
 msgstr "Mensagem exibida se ultrapassou o limite do total das entradas."
 
-#: ../includes/qmn_options_text_tab.php:249
+#: ../includes/qmn_options_text_tab.php:250
 msgid "%QUESTIONS_ANSWERS% Text"
 msgstr "%QUESTIONS_ANSWERS% Texto"
 
-#: ../includes/qmn_options_text_tab.php:262
+#: ../includes/qmn_options_text_tab.php:263
 msgid "Twitter Sharing Text"
 msgstr "Compartilhar texto Twitter"
 
-#: ../includes/qmn_options_text_tab.php:279
+#: ../includes/qmn_options_text_tab.php:280
 msgid "Facebook Sharing Text"
 msgstr "Compartilhar Texto Facebook  "
 
-#: ../includes/qmn_options_text_tab.php:294
+#: ../includes/qmn_options_text_tab.php:295
 msgid "Other Templates"
 msgstr "Outros Modelos"
 
-#: ../includes/qmn_options_text_tab.php:297
+#: ../includes/qmn_options_text_tab.php:298
 msgid "Text for submit button"
 msgstr "Texto para botão submeter"
 
-#: ../includes/qmn_options_text_tab.php:301
+#: ../includes/qmn_options_text_tab.php:302
 msgid "Text for name field"
 msgstr "Texto para o Campo Nome"
 
-#: ../includes/qmn_options_text_tab.php:305
+#: ../includes/qmn_options_text_tab.php:306
 msgid "Text for business field"
 msgstr "Texto para o Campo Empresa"
 
-#: ../includes/qmn_options_text_tab.php:309
+#: ../includes/qmn_options_text_tab.php:310
 msgid "Text for email field"
 msgstr "Texto para o campo e-mail"
 
-#: ../includes/qmn_options_text_tab.php:313
+#: ../includes/qmn_options_text_tab.php:314
 msgid "Text for phone number field"
 msgstr "Texto para o campo numero telefone"
 
-#: ../includes/qmn_options_text_tab.php:317
+#: ../includes/qmn_options_text_tab.php:318
 msgid "Text for comments field"
 msgstr "Texto para o campo comentários"
 
-#: ../includes/qmn_options_text_tab.php:321
+#: ../includes/qmn_options_text_tab.php:322
 msgid "Text for previous button"
 msgstr "Texto para o botão anterior"
 
-#: ../includes/qmn_options_text_tab.php:325
+#: ../includes/qmn_options_text_tab.php:326
 msgid "Text for next button"
 msgstr "Texto para botão próximo "
 
@@ -605,40 +605,40 @@ msgstr "O certificado foi atualizado com sucesso."
 msgid "Enter title here"
 msgstr "Coloque o título aqui"
 
-#: ../includes/qmn_options_certificate_tab.php:70
+#: ../includes/qmn_options_certificate_tab.php:65
 msgid "Quiz Certificate (Beta)"
 msgstr "Certificado de Avaliação"
 
-#: ../includes/qmn_options_certificate_tab.php:71
+#: ../includes/qmn_options_certificate_tab.php:66
 msgid "Enter in your text here to fill in the certificate for this quiz. Be sure to enter in the link variable into the templates on the Quiz Text tab so the user can access the certificate."
 msgstr "Digite em seu texto aqui para preencher o certificado para esta avaliação. Certifique-se de entrarno link para os modelos da guia Texto do Questionário de modo que o usuário pode acessar o certificado."
 
-#: ../includes/qmn_options_certificate_tab.php:72
+#: ../includes/qmn_options_certificate_tab.php:67
 msgid "These fields cannot contain HTML."
 msgstr "Estes campos não contém HTML."
 
-#: ../includes/qmn_options_certificate_tab.php:73
-#: ../includes/qmn_options_certificate_tab.php:129
+#: ../includes/qmn_options_certificate_tab.php:68
+#: ../includes/qmn_options_certificate_tab.php:124
 msgid "Save Certificate Options"
 msgstr "Salvar Opções de Certificado"
 
-#: ../includes/qmn_options_certificate_tab.php:81
+#: ../includes/qmn_options_certificate_tab.php:76
 msgid "Enable Certificates For This Quiz?"
 msgstr "Ativar Certificados para esta Avaliação?"
 
-#: ../includes/qmn_options_certificate_tab.php:89
+#: ../includes/qmn_options_certificate_tab.php:84
 msgid "Certificate Title"
 msgstr "Título do Certificado"
 
-#: ../includes/qmn_options_certificate_tab.php:96
+#: ../includes/qmn_options_certificate_tab.php:91
 msgid "Message Displayed On Certificate"
 msgstr "Mensagem exibida no Certificado"
 
-#: ../includes/qmn_options_certificate_tab.php:116
+#: ../includes/qmn_options_certificate_tab.php:111
 msgid "URL To Logo (Must be JPG, JPEG, PNG or GIF)"
 msgstr "URL para o Logo ( JPG, JPEG, PNG or GIF)"
 
-#: ../includes/qmn_options_certificate_tab.php:123
+#: ../includes/qmn_options_certificate_tab.php:118
 msgid "URL To Background Img (Must be JPG, JPEG, PNG or GIF)"
 msgstr "URL para o Background Img ( JPG, JPEG, PNG or GIF)"
 
@@ -678,12 +678,12 @@ msgstr "A questão foi criada com sucesso."
 #: ../includes/qmn_options_questions_tab.php:454
 #: ../includes/qmn_options_questions_tab.php:461
 #: ../includes/qmn_options_questions_tab.php:593
-#: ../includes/qmn_options_questions_tab.php:760
+#: ../includes/qmn_options_questions_tab.php:761
 msgid "Answer"
 msgstr "Resposta"
 
 #: ../includes/qmn_options_questions_tab.php:481
-#: ../includes/qmn_options_questions_tab.php:729
+#: ../includes/qmn_options_questions_tab.php:730
 msgid "Add Question"
 msgstr "Adicionar Pergunta"
 
@@ -710,90 +710,90 @@ msgid "Delete"
 msgstr "Delete Questionário"
 
 #: ../includes/qmn_options_questions_tab.php:568
-#: ../includes/qmn_options_questions_tab.php:737
+#: ../includes/qmn_options_questions_tab.php:738
 msgid "For fill in the blank types, use %BLANK% to represent where to put the text box in your text."
 msgstr ""
 
 #: ../includes/qmn_options_questions_tab.php:571
 #: ../includes/qmn_options_questions_tab.php:714
 #: ../includes/qmn_options_questions_tab.php:725
-#: ../includes/qmn_options_questions_tab.php:740
+#: ../includes/qmn_options_questions_tab.php:741
 msgid "Question"
 msgstr "Pergunta"
 
 #: ../includes/qmn_options_questions_tab.php:582
-#: ../includes/qmn_options_questions_tab.php:751
+#: ../includes/qmn_options_questions_tab.php:752
 msgid "Answers"
 msgstr "Respostas"
 
 #: ../includes/qmn_options_questions_tab.php:583
-#: ../includes/qmn_options_questions_tab.php:752
+#: ../includes/qmn_options_questions_tab.php:753
 msgid "Points Worth"
 msgstr "Vale Pontos"
 
 #: ../includes/qmn_options_questions_tab.php:584
-#: ../includes/qmn_options_questions_tab.php:753
+#: ../includes/qmn_options_questions_tab.php:754
 msgid "Correct Answer"
 msgstr "Resposta correta"
 
 #: ../includes/qmn_options_questions_tab.php:611
-#: ../includes/qmn_options_questions_tab.php:775
+#: ../includes/qmn_options_questions_tab.php:776
 msgid "Add New Answer!"
 msgstr "Adicionar nova Resposta"
 
 #: ../includes/qmn_options_questions_tab.php:616
-#: ../includes/qmn_options_questions_tab.php:780
+#: ../includes/qmn_options_questions_tab.php:781
 msgid "Correct Answer Info"
 msgstr "Informação da resposta correta"
 
 #: ../includes/qmn_options_questions_tab.php:634
 #: ../includes/qmn_options_questions_tab.php:712
 #: ../includes/qmn_options_questions_tab.php:723
-#: ../includes/qmn_options_questions_tab.php:798
+#: ../includes/qmn_options_questions_tab.php:799
 msgid "Question Type"
 msgstr "Tipo de pergunta"
 
 #: ../includes/qmn_options_questions_tab.php:652
-#: ../includes/qmn_options_questions_tab.php:811
+#: ../includes/qmn_options_questions_tab.php:812
 msgid "Comment Field"
 msgstr "Comentários"
 
 #: ../includes/qmn_options_questions_tab.php:655
-#: ../includes/qmn_options_questions_tab.php:813
+#: ../includes/qmn_options_questions_tab.php:814
 msgid "Small Text Field"
 msgstr "Campo de texto pequeno"
 
 #: ../includes/qmn_options_questions_tab.php:657
-#: ../includes/qmn_options_questions_tab.php:814
+#: ../includes/qmn_options_questions_tab.php:815
 msgid "Large Text Field"
 msgstr "Campo de texto Grande"
 
 #: ../includes/qmn_options_questions_tab.php:659
-#: ../includes/qmn_options_questions_tab.php:815
+#: ../includes/qmn_options_questions_tab.php:816
 msgid "None"
 msgstr ""
 
 #: ../includes/qmn_options_questions_tab.php:663
 #: ../includes/qmn_options_questions_tab.php:711
 #: ../includes/qmn_options_questions_tab.php:722
-#: ../includes/qmn_options_questions_tab.php:819
+#: ../includes/qmn_options_questions_tab.php:820
 msgid "Question Order"
 msgstr "Ordem das perguntas"
 
 #: ../includes/qmn_options_questions_tab.php:671
-#: ../includes/qmn_options_questions_tab.php:827
+#: ../includes/qmn_options_questions_tab.php:828
 msgid "Required?"
 msgstr "Exigido?"
 
 #: ../includes/qmn_options_questions_tab.php:680
 #: ../includes/qmn_options_questions_tab.php:713
 #: ../includes/qmn_options_questions_tab.php:724
-#: ../includes/qmn_options_questions_tab.php:836
+#: ../includes/qmn_options_questions_tab.php:837
 msgid "Category"
 msgstr ""
 
 #: ../includes/qmn_options_questions_tab.php:699
-#: ../includes/qmn_options_questions_tab.php:855
+#: ../includes/qmn_options_questions_tab.php:856
 msgid "Required currently only works on open answer, number, accept, and captcha question types"
 msgstr "Necessário atualmente só funciona com resposta aberta, número, aceitar e tipos de captcha."
 
@@ -801,23 +801,23 @@ msgstr "Necessário atualmente só funciona com resposta aberta, número, aceita
 msgid "Edit Question"
 msgstr "Editar Pergunta"
 
-#: ../includes/qmn_options_questions_tab.php:857
+#: ../includes/qmn_options_questions_tab.php:858
 msgid "Create Question"
 msgstr "Criar Pergunta"
 
-#: ../includes/qmn_options_questions_tab.php:862
+#: ../includes/qmn_options_questions_tab.php:863
 msgid "Are you sure you want to delete this question?"
 msgstr "Tem certeza de que deseja excluir esta pergunta?"
 
-#: ../includes/qmn_options_questions_tab.php:867
+#: ../includes/qmn_options_questions_tab.php:868
 msgid "Delete Question"
 msgstr "Apagar Perguntas"
 
-#: ../includes/qmn_options_questions_tab.php:872
+#: ../includes/qmn_options_questions_tab.php:873
 msgid "Are you sure you want to duplicate this question?"
 msgstr "Tem certeza de que deseja duplicar esta pergunta?"
 
-#: ../includes/qmn_options_questions_tab.php:877
+#: ../includes/qmn_options_questions_tab.php:878
 msgid "Duplicate Question"
 msgstr "Duplicar Pergunta"
 
diff --git a/languages/quiz-master-next-th.mo b/languages/quiz-master-next-th.mo
index aa1fd7fb2..c7c809045 100644
Binary files a/languages/quiz-master-next-th.mo and b/languages/quiz-master-next-th.mo differ
diff --git a/languages/quiz-master-next-th.po b/languages/quiz-master-next-th.po
index ce3b161ca..2e496e87e 100644
--- a/languages/quiz-master-next-th.po
+++ b/languages/quiz-master-next-th.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Quiz Master Next\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-25 21:01-0500\n"
+"POT-Creation-Date: 2015-03-31 20:22-0500\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Frank Corso <frank@mylocalwebstop.com>\n"
 "Language-Team: My Local Webstop <fpcorso@mylocalwebstop.com>\n"
@@ -425,16 +425,16 @@ msgid "Leaderboard Template"
 msgstr "แม่แบบกระดานผู้นำ"
 
 #: includes/qmn_options_leaderboard_tab.php:91
-#: includes/qmn_options_text_tab.php:181
-#: includes/qmn_options_text_tab.php:191
-#: includes/qmn_options_text_tab.php:201
-#: includes/qmn_options_text_tab.php:211
-#: includes/qmn_options_text_tab.php:221
-#: includes/qmn_options_text_tab.php:231
-#: includes/qmn_options_text_tab.php:241
-#: includes/qmn_options_text_tab.php:251
-#: includes/qmn_options_text_tab.php:264
-#: includes/qmn_options_text_tab.php:281
+#: includes/qmn_options_text_tab.php:182
+#: includes/qmn_options_text_tab.php:192
+#: includes/qmn_options_text_tab.php:202
+#: includes/qmn_options_text_tab.php:212
+#: includes/qmn_options_text_tab.php:222
+#: includes/qmn_options_text_tab.php:232
+#: includes/qmn_options_text_tab.php:242
+#: includes/qmn_options_text_tab.php:252
+#: includes/qmn_options_text_tab.php:265
+#: includes/qmn_options_text_tab.php:282
 msgid "Allowed Variables:"
 msgstr "ตัวแปรที่อนุญาตื"
 
@@ -458,88 +458,88 @@ msgstr "ข้อความ"
 msgid "The templates has been updated successfully."
 msgstr "อัพเดทแม่แบบเรียบร้อย"
 
-#: includes/qmn_options_text_tab.php:169
-#: includes/qmn_options_text_tab.php:329
+#: includes/qmn_options_text_tab.php:170
+#: includes/qmn_options_text_tab.php:330
 msgid "Save Templates"
 msgstr "บันทึกแม่แบบ"
 
-#: includes/qmn_options_text_tab.php:175
+#: includes/qmn_options_text_tab.php:176
 msgid "Message Templates"
 msgstr "แม่แบบข้อความ"
 
-#: includes/qmn_options_text_tab.php:179
+#: includes/qmn_options_text_tab.php:180
 msgid "Message Displayed Before Quiz"
 msgstr "ข้อความที่แสดงก่อนทำแบบทดสอบ"
 
-#: includes/qmn_options_text_tab.php:189
+#: includes/qmn_options_text_tab.php:190
 msgid "Message Displayed Before Comments Box If Enabled"
 msgstr "ข้อความที่ถูกแสดงก่อนช่องข้อแนะนำ, หากเปิดใช้"
 
-#: includes/qmn_options_text_tab.php:199
+#: includes/qmn_options_text_tab.php:200
 msgid "Message Displayed At End Of Quiz (Leave Blank To Omit Text Section)"
 msgstr "ข้อความที่ถูกแสดงทำแบบทดสอบเสร็จ (ปล่อยว่างเพื่อละเว้นการเลือกข้อความ)"
 
-#: includes/qmn_options_text_tab.php:209
+#: includes/qmn_options_text_tab.php:210
 msgid "Message Displayed If User Has Tried Quiz Too Many Times"
 msgstr "ข้อความที่ถูกแสดงหากผู้ใช้ทำแบบทดสอบหลายครั้งเกินไป"
 
-#: includes/qmn_options_text_tab.php:219
+#: includes/qmn_options_text_tab.php:220
 msgid "Message Displayed If User Is Not Logged In And Quiz Requires Users To Be Logged In"
 msgstr "ข้อความที่ถูกแสดง เมื่อผู้ใช้ไม่ได้ลงชื่อเข้าใช้ เมื่อแบบทดสอบต้องการลงชื่อเข้าใช้งาน"
 
-#: includes/qmn_options_text_tab.php:229
+#: includes/qmn_options_text_tab.php:230
 msgid "Message Displayed If Date Is Outside Scheduled Timeframe"
 msgstr "ข้อความที่ถูกแสดงถ้าวันที่อยู่นอกวันเวลาที่อนุญาติใช้งาน"
 
-#: includes/qmn_options_text_tab.php:239
+#: includes/qmn_options_text_tab.php:240
 msgid "Message Displayed If The Limit Of Total Entries Has Been Reached"
 msgstr "ข้อความที่ถูกแสดงหากจำนวนรายการเกินกำหนด"
 
-#: includes/qmn_options_text_tab.php:249
+#: includes/qmn_options_text_tab.php:250
 msgid "%QUESTIONS_ANSWERS% Text"
 msgstr "%QUESTIONS_ANSWERS% ข้อความ"
 
-#: includes/qmn_options_text_tab.php:262
+#: includes/qmn_options_text_tab.php:263
 msgid "Twitter Sharing Text"
 msgstr "ข้อความแชร์ทวิตเตอร์"
 
-#: includes/qmn_options_text_tab.php:279
+#: includes/qmn_options_text_tab.php:280
 msgid "Facebook Sharing Text"
 msgstr "ข้อความแชร์เฟสบุค"
 
-#: includes/qmn_options_text_tab.php:294
+#: includes/qmn_options_text_tab.php:295
 msgid "Other Templates"
 msgstr "แม่แบบอื่นๆ"
 
-#: includes/qmn_options_text_tab.php:297
+#: includes/qmn_options_text_tab.php:298
 msgid "Text for submit button"
 msgstr "ข้อความสำหรับปุ่ม ส่ง"
 
-#: includes/qmn_options_text_tab.php:301
+#: includes/qmn_options_text_tab.php:302
 msgid "Text for name field"
 msgstr "ข้อความสำหรับช่องชื่อ"
 
-#: includes/qmn_options_text_tab.php:305
+#: includes/qmn_options_text_tab.php:306
 msgid "Text for business field"
 msgstr "ข้อความสำหรับช่องที่ทำงาน"
 
-#: includes/qmn_options_text_tab.php:309
+#: includes/qmn_options_text_tab.php:310
 msgid "Text for email field"
 msgstr "ข้อความสำหรับข่องอีเมล์"
 
-#: includes/qmn_options_text_tab.php:313
+#: includes/qmn_options_text_tab.php:314
 msgid "Text for phone number field"
 msgstr "ข้อความสำหรับช่องโทรศัพท์"
 
-#: includes/qmn_options_text_tab.php:317
+#: includes/qmn_options_text_tab.php:318
 msgid "Text for comments field"
 msgstr "ข้อความสำหรับช่องข้อแนะนำ"
 
-#: includes/qmn_options_text_tab.php:321
+#: includes/qmn_options_text_tab.php:322
 msgid "Text for previous button"
 msgstr "ข้อความสำหรับปุ่ม ก่อนหน้า"
 
-#: includes/qmn_options_text_tab.php:325
+#: includes/qmn_options_text_tab.php:326
 msgid "Text for next button"
 msgstr "ข้อความสำหรับปุ่ม ถัดไป"
 
@@ -603,40 +603,40 @@ msgstr "อัพเดทประกาศนียบัตรเรียบ
 msgid "Enter title here"
 msgstr "กรอกหัวข้อที่นี่"
 
-#: includes/qmn_options_certificate_tab.php:70
+#: includes/qmn_options_certificate_tab.php:65
 msgid "Quiz Certificate (Beta)"
 msgstr "ประกาศนียบัตรสำหรับแบบทดสอบ (รุ่นทดลอง)"
 
-#: includes/qmn_options_certificate_tab.php:71
+#: includes/qmn_options_certificate_tab.php:66
 msgid "Enter in your text here to fill in the certificate for this quiz. Be sure to enter in the link variable into the templates on the Quiz Text tab so the user can access the certificate."
 msgstr "กรอกข้อความที่นี่เพื่อเติมลงในประกาศนียบัตรสำหรับแบบทดสอบนี้ โปรดใส่ลิงค์ไปยังตัวแปรในแม่แบบ (Templates) ในแท็บ ข้อความแบบทดสอบ เพื่อให้ผู้ใช้งานสามารถเข้าสู่ประกาศนียบัตรได้"
 
-#: includes/qmn_options_certificate_tab.php:72
+#: includes/qmn_options_certificate_tab.php:67
 msgid "These fields cannot contain HTML."
 msgstr "ไม่สามารถใช้ HTML ในช่องนี้"
 
-#: includes/qmn_options_certificate_tab.php:73
-#: includes/qmn_options_certificate_tab.php:129
+#: includes/qmn_options_certificate_tab.php:68
+#: includes/qmn_options_certificate_tab.php:124
 msgid "Save Certificate Options"
 msgstr "บันทึกการตั้งค่าประกาศนียบัตร"
 
-#: includes/qmn_options_certificate_tab.php:81
+#: includes/qmn_options_certificate_tab.php:76
 msgid "Enable Certificates For This Quiz?"
 msgstr "ใช้งานประกาศนียบัตรสำหรับแบบทดสอบนี้?"
 
-#: includes/qmn_options_certificate_tab.php:89
+#: includes/qmn_options_certificate_tab.php:84
 msgid "Certificate Title"
 msgstr "หัวข้อประกาศนียบัตร"
 
-#: includes/qmn_options_certificate_tab.php:96
+#: includes/qmn_options_certificate_tab.php:91
 msgid "Message Displayed On Certificate"
 msgstr "ข้อความแสดงบนประกาศนียบัตร"
 
-#: includes/qmn_options_certificate_tab.php:116
+#: includes/qmn_options_certificate_tab.php:111
 msgid "URL To Logo (Must be JPG, JPEG, PNG or GIF)"
 msgstr "URL ไปยังโลโก้  (ชนิด JPG, JPEG, PNG or GIF)"
 
-#: includes/qmn_options_certificate_tab.php:123
+#: includes/qmn_options_certificate_tab.php:118
 msgid "URL To Background Img (Must be JPG, JPEG, PNG or GIF)"
 msgstr "URL ไปยังภาพพื้นหลัง (ชนิด JPG, JPEG, PNG or GIF)"
 
@@ -676,12 +676,12 @@ msgstr "สร้างคำถามเรียบร้อย"
 #: includes/qmn_options_questions_tab.php:454
 #: includes/qmn_options_questions_tab.php:461
 #: includes/qmn_options_questions_tab.php:593
-#: includes/qmn_options_questions_tab.php:760
+#: includes/qmn_options_questions_tab.php:761
 msgid "Answer"
 msgstr "คำตอบ"
 
 #: includes/qmn_options_questions_tab.php:481
-#: includes/qmn_options_questions_tab.php:729
+#: includes/qmn_options_questions_tab.php:730
 msgid "Add Question"
 msgstr "เพิ่มคำถาม"
 
@@ -706,90 +706,90 @@ msgid "Delete"
 msgstr "ลบ"
 
 #: includes/qmn_options_questions_tab.php:568
-#: includes/qmn_options_questions_tab.php:737
+#: includes/qmn_options_questions_tab.php:738
 msgid "For fill in the blank types, use %BLANK% to represent where to put the text box in your text."
 msgstr ""
 
 #: includes/qmn_options_questions_tab.php:571
 #: includes/qmn_options_questions_tab.php:714
 #: includes/qmn_options_questions_tab.php:725
-#: includes/qmn_options_questions_tab.php:740
+#: includes/qmn_options_questions_tab.php:741
 msgid "Question"
 msgstr "คำถาม"
 
 #: includes/qmn_options_questions_tab.php:582
-#: includes/qmn_options_questions_tab.php:751
+#: includes/qmn_options_questions_tab.php:752
 msgid "Answers"
 msgstr "คำตอบ"
 
 #: includes/qmn_options_questions_tab.php:583
-#: includes/qmn_options_questions_tab.php:752
+#: includes/qmn_options_questions_tab.php:753
 msgid "Points Worth"
 msgstr "ค่าคะแนน"
 
 #: includes/qmn_options_questions_tab.php:584
-#: includes/qmn_options_questions_tab.php:753
+#: includes/qmn_options_questions_tab.php:754
 msgid "Correct Answer"
 msgstr "ข้อที่ถูกต้อง"
 
 #: includes/qmn_options_questions_tab.php:611
-#: includes/qmn_options_questions_tab.php:775
+#: includes/qmn_options_questions_tab.php:776
 msgid "Add New Answer!"
 msgstr "เพิ่มคำตอบใหม่"
 
 #: includes/qmn_options_questions_tab.php:616
-#: includes/qmn_options_questions_tab.php:780
+#: includes/qmn_options_questions_tab.php:781
 msgid "Correct Answer Info"
 msgstr "ข้อความข้อที่ถูกต้อง"
 
 #: includes/qmn_options_questions_tab.php:634
 #: includes/qmn_options_questions_tab.php:712
 #: includes/qmn_options_questions_tab.php:723
-#: includes/qmn_options_questions_tab.php:798
+#: includes/qmn_options_questions_tab.php:799
 msgid "Question Type"
 msgstr "ชนิดคำถาม"
 
 #: includes/qmn_options_questions_tab.php:652
-#: includes/qmn_options_questions_tab.php:811
+#: includes/qmn_options_questions_tab.php:812
 msgid "Comment Field"
 msgstr "ข้อเสนอแนะ"
 
 #: includes/qmn_options_questions_tab.php:655
-#: includes/qmn_options_questions_tab.php:813
+#: includes/qmn_options_questions_tab.php:814
 msgid "Small Text Field"
 msgstr "ข้อความสั้น"
 
 #: includes/qmn_options_questions_tab.php:657
-#: includes/qmn_options_questions_tab.php:814
+#: includes/qmn_options_questions_tab.php:815
 msgid "Large Text Field"
 msgstr "ข้อความยาว"
 
 #: includes/qmn_options_questions_tab.php:659
-#: includes/qmn_options_questions_tab.php:815
+#: includes/qmn_options_questions_tab.php:816
 msgid "None"
 msgstr "ไม่มี"
 
 #: includes/qmn_options_questions_tab.php:663
 #: includes/qmn_options_questions_tab.php:711
 #: includes/qmn_options_questions_tab.php:722
-#: includes/qmn_options_questions_tab.php:819
+#: includes/qmn_options_questions_tab.php:820
 msgid "Question Order"
 msgstr "ลำดับคำถาม"
 
 #: includes/qmn_options_questions_tab.php:671
-#: includes/qmn_options_questions_tab.php:827
+#: includes/qmn_options_questions_tab.php:828
 msgid "Required?"
 msgstr "บังคับ?"
 
 #: includes/qmn_options_questions_tab.php:680
 #: includes/qmn_options_questions_tab.php:713
 #: includes/qmn_options_questions_tab.php:724
-#: includes/qmn_options_questions_tab.php:836
+#: includes/qmn_options_questions_tab.php:837
 msgid "Category"
 msgstr "หมวดหมู่"
 
 #: includes/qmn_options_questions_tab.php:699
-#: includes/qmn_options_questions_tab.php:855
+#: includes/qmn_options_questions_tab.php:856
 msgid "Required currently only works on open answer, number, accept, and captcha question types"
 msgstr "บังคับได้เฉพาะคำถามแบบ คำตอบปลายเปิด ตัวเลข และ captcha เท่านั้น"
 
@@ -797,23 +797,23 @@ msgstr "บังคับได้เฉพาะคำถามแบบ ค
 msgid "Edit Question"
 msgstr "แก้ไขคำถาม"
 
-#: includes/qmn_options_questions_tab.php:857
+#: includes/qmn_options_questions_tab.php:858
 msgid "Create Question"
 msgstr "สร้างคำถาม"
 
-#: includes/qmn_options_questions_tab.php:862
+#: includes/qmn_options_questions_tab.php:863
 msgid "Are you sure you want to delete this question?"
 msgstr "คุณแน่ใจหรือไม่ที่จะลบคำถามนี้?"
 
-#: includes/qmn_options_questions_tab.php:867
+#: includes/qmn_options_questions_tab.php:868
 msgid "Delete Question"
 msgstr "ลบคำถาม"
 
-#: includes/qmn_options_questions_tab.php:872
+#: includes/qmn_options_questions_tab.php:873
 msgid "Are you sure you want to duplicate this question?"
 msgstr "คุณแน่ใจหรือไม่ที่จะสำเนาคำถามนี้?"
 
-#: includes/qmn_options_questions_tab.php:877
+#: includes/qmn_options_questions_tab.php:878
 msgid "Duplicate Question"
 msgstr "ทำสำเนาคำถาม"
 
diff --git a/mlw_quizmaster2.php b/mlw_quizmaster2.php
index 730035a36..828c5edb5 100644
--- a/mlw_quizmaster2.php
+++ b/mlw_quizmaster2.php
@@ -2,7 +2,7 @@
 /**
 * Plugin Name: Quiz Master Next
 * Description: Use this plugin to add multiple quizzes, tests, or surveys to your website.
-* Version: 4.2.3
+* Version: 4.2.4
 * Author: Frank Corso
 * Author URI: http://www.mylocalwebstop.com/
 * Plugin URI: http://www.quizmasternext.com/
@@ -16,7 +16,7 @@
 * You understand that you install, operate, and unistall the plugin at your own discretion and risk.
 *
 * @author Frank Corso
-* @version 4.2.3
+* @version 4.2.4
 */
 if ( ! defined( 'ABSPATH' ) ) exit;
 /**
@@ -34,7 +34,7 @@ class MLWQuizMasterNext
 	 * @var string
 	 * @since 4.0.0
 	 */
-	public $version = '4.2.3';
+	public $version = '4.2.4';
 
 	/**
 	 * QMN Alert Manager Object
diff --git a/readme.txt b/readme.txt
index a5d3c41a5..15a59679e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,8 @@ Donate link: http://mylocalwebstop.com/downloads/donation-service-payment/
 Tags: quiz, test, score, exam, survey, contact, form, email, answer, question, certificate, points, results, math
 Requires at least: 3.8.1
 Tested up to: 4.1.1
-Stable tag: 4.2.3
+Stable tag: 4.2.4
+License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
 The easiest and most flexible way to add multiple quizzes, tests, and surveys to your website.
@@ -121,6 +122,10 @@ Feel free to use the widget on the help page within the plugin or from our [cont
 
 == Changelog ==
 
+= 4.2.4 (April 1, 2015) =
+ * Minor Design Changes
+ * Minor Bug Fixes
+
 = 4.2.3 (March 26, 2015) =
  * Minor Design Changes
  * Minor Bug Fixes