diff --git a/src/lib/Core.jsx b/src/lib/Core.jsx
index 83b62896..afa32db6 100644
--- a/src/lib/Core.jsx
+++ b/src/lib/Core.jsx
@@ -131,7 +131,7 @@ function Core({
         && `${index + 1}` === `${userInputIndex}` ? 'incorrect' : '';
 
         if (userInputIndex === undefined && `${index + 1}` !== correctAnswer) {
-          answerBtnIncorrectClassName = ' unanswered';
+          answerBtnIncorrectClassName = 'unanswered';
         }
       } else {
         // correctAnswer - is array of numbers
@@ -142,7 +142,7 @@ function Core({
         && userInputIndex?.includes(index + 1) ? 'incorrect' : '';
 
         if (userInputIndex === undefined && !correctAnswer.includes(index + 1)) {
-          answerBtnIncorrectClassName = ' unanswered';
+          answerBtnIncorrectClassName = 'unanswered';
         }
       }
 
@@ -199,28 +199,18 @@ function Core({
     let filteredUserInput;
 
     if (filteredValue !== 'all') {
+      let targetQuestions = unanswered;
       if (filteredValue === 'correct') {
-        filteredQuestions = questions.filter(
-          (question, index) => correct.indexOf(index) !== -1,
-        );
-        filteredUserInput = userInput.filter(
-          (input, index) => correct.indexOf(index) !== -1,
-        );
+        targetQuestions = correct;
       } else if (filteredValue === 'incorrect') {
-        filteredQuestions = questions.filter(
-          (question, index) => incorrect.indexOf(index) !== -1,
-        );
-        filteredUserInput = userInput.filter(
-          (input, index) => incorrect.indexOf(index) !== -1,
-        );
-      } else if (filteredValue === 'unanswered') {
-        filteredQuestions = questions.filter(
-          (question, index) => unanswered.indexOf(index) !== -1,
-        );
-        filteredUserInput = userInput.filter(
-          (input, index) => unanswered.indexOf(index) !== -1,
-        );
+        targetQuestions = incorrect;
       }
+      filteredQuestions = questions.filter(
+        (_, index) => targetQuestions.indexOf(index) !== -1,
+      );
+      filteredUserInput = userInput.filter(
+        (_, index) => targetQuestions.indexOf(index) !== -1,
+      );
     }
 
     return (filteredQuestions || questions).map((question, index) => {
@@ -382,13 +372,14 @@ function Core({
     setIsRunning(!isRunning);
   };
 
+  const formatTime = (time) => (time < 10 ? '0' : '');
   const displayTime = (time) => {
     const hours = Math.floor(time / 3600);
     const minutes = Math.floor((time % 3600) / 60);
     const seconds = time % 60;
 
-    return `${hours}:${minutes < 10 ? '0' : ''}${minutes}:${
-      seconds < 10 ? '0' : ''
+    return `${formatTime(hours)}${hours}:${formatTime(minutes)}${minutes}:${
+      formatTime(seconds)
     }${seconds}`;
   };
 
@@ -402,14 +393,16 @@ function Core({
     <div className="questionWrapper">
       {timer && !isRunning && (
         <div>
-          Time Taken:
+          {appLocale.timerTimeTaken}
+          :
           <b>{displayTime(timer - timeRemaining)}</b>
         </div>
       )}
 
       {timer && isRunning && (
         <div>
-          Time Remaining:
+          {appLocale.timerTimeRemaining}
+          :
           <b>{displayTime(timeRemaining)}</b>
         </div>
       )}
@@ -424,7 +417,7 @@ function Core({
             <br />
             {timer && allowPauseTimer && (
               <button type="button" className="timerBtn" onClick={toggleTimer}>
-                {isRunning ? 'Pause' : 'Resume'}
+                {isRunning ? appLocale.pauseScreenPause : appLocale.pauseScreenResume}
               </button>
             )}
           </div>
@@ -449,6 +442,16 @@ function Core({
                   activeQuestion.correctAnswer.length,
                   activeQuestion.segment,
                 )}
+              <div className="questionModal">
+                <InstantFeedback
+                  question={activeQuestion}
+                  showInstantFeedback={showInstantFeedback}
+                  correctAnswer={isCorrect}
+                  incorrectAnswer={incorrectAnswer}
+                  onQuestionSubmit={onQuestionSubmit}
+                  userAnswer={[...userInput].pop()}
+                />
+              </div>
               {activeQuestion && renderAnswers(activeQuestion, buttons)}
               {(showNextQuestionButton || allowNavigation) && (
                 <div className="questionBtnContainer">
@@ -469,17 +472,6 @@ function Core({
                   >
                     {appLocale.nextQuestionBtn}
                   </button>
-
-                  <div className="questionModal">
-                    <InstantFeedback
-                      question={activeQuestion}
-                      showInstantFeedback={showInstantFeedback}
-                      correctAnswer={isCorrect}
-                      incorrectAnswer={incorrectAnswer}
-                      onQuestionSubmit={onQuestionSubmit}
-                      userAnswer={[...userInput].pop()}
-                    />
-                  </div>
                 </div>
               )}
             </>
diff --git a/src/lib/Locale.jsx b/src/lib/Locale.jsx
index 27a3ed38..e6f213ef 100644
--- a/src/lib/Locale.jsx
+++ b/src/lib/Locale.jsx
@@ -11,6 +11,10 @@ const defaultLocale = {
   resultPageHeaderText: 'You have completed the quiz. You got <correctIndexLength> out of <questionLength> questions.',
   resultPagePoint: 'You scored <correctPoints> out of <totalPoints>.',
   pauseScreenDisplay: 'Test is paused. Clicked the Resume button to continue',
+  timerTimeRemaining: 'Time Remaining',
+  timerTimeTaken: 'Time Taken',
+  pauseScreenPause: 'Pause',
+  pauseScreenResume: 'Resume',
   singleSelectionTagText: 'Single Selection',
   multipleSelectionTagText: 'Multiple Selection',
   pickNumberOfSelection: 'Pick <numberOfSelection>',
diff --git a/src/lib/Quiz.jsx b/src/lib/Quiz.jsx
index 6cf885ed..61900311 100644
--- a/src/lib/Quiz.jsx
+++ b/src/lib/Quiz.jsx
@@ -97,6 +97,14 @@ function Quiz({
       console.error('Quiz object is required.');
       return false;
     }
+    if (timer && typeof timer !== 'number') {
+      console.error('timer must be a number');
+      return false;
+    }
+    if (allowPauseTimer && typeof allowPauseTimer !== 'boolean') {
+      console.error('allowPauseTimer must be a Boolean');
+      return false;
+    }
 
     for (let i = 0; i < questions.length; i += 1) {
       const {
diff --git a/src/lib/styles.css b/src/lib/styles.css
index 29970872..442ccb35 100644
--- a/src/lib/styles.css
+++ b/src/lib/styles.css
@@ -47,7 +47,7 @@
   width: 80px;
   color: #fff;
   padding: 5px;
-  margin-bottom: 10px;
+  top: -35px;
   border-radius: 10px;
   position: relative;
   float: right;