diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
index df0d5eaaff7f8d4105cfbe37b38aaffbb2c86819..274c9d6394de0938de0c49774482af1de0edda0f 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js
@@ -55,9 +55,9 @@ class MultipleChoiceQuestion extends Tools {
   label = 'Multiple Choice';
 
   get run() {
-    return (view, main, context) => {
+    return (view, context) => {
       checkifEmpty(view);
-      createOption(main, context);
+      createOption(view, context);
     };
   }
 
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js
index 9cfa3b32cb72992eeac7c1541a59bc329ff1e7cb..eaa9c65282ca876245b9b1729ddbccc99eb8243e 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js
@@ -55,9 +55,9 @@ class MultipleChoiceSingleCorrectQuestion extends Tools {
   label = 'Multiple Choice Single Correct';
 
   get run() {
-    return (view, main, context) => {
+    return (view, context) => {
       checkifEmpty(view);
-      createOption(main, context);
+      createOption(view, context);
     };
   }
 
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js
index 170c9511434894f509d95261dd267181c0d944da..d4fe0a31179f016931f21a6b0b1233b56479d25b 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js
@@ -55,9 +55,9 @@ class MultipleChoiceQuestion extends Tools {
   label = 'True False';
 
   get run() {
-    return (view, main, context) => {
+    return (view, context) => {
       checkifEmpty(view);
-      createOption(main, context);
+      createOption(view, context);
     };
   }
 
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/ToolBarBtn.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/ToolBarBtn.js
index d583f3b18d6f40f4303a1a7e1c73be7330d8d320..84090be501c7a846357f7f570d52e7d327f4356a 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/ToolBarBtn.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/ToolBarBtn.js
@@ -13,44 +13,37 @@ const StyledButton = styled(MenuButton)`
 `;
 
 const ToolBarBtn = ({ view = {}, item }) => {
-  const { active, icon, label, onlyOnMain, run, select, title } = item;
+  const { icon, label, select, title } = item;
   const context = useContext(WaxContext);
   const {
     view: { main },
-    activeViewId,
     activeView,
   } = useContext(WaxContext);
 
-  if (onlyOnMain) view = main;
-
   const isEditable = main.props.editable(editable => {
     return editable;
   });
 
   const { state } = view;
 
-  const isActive = !!(
-    active(state, activeViewId) && select(state, activeViewId)
-  );
-
   let isDisabled = !select(state, activeView);
   if (!isEditable) isDisabled = true;
 
   const ToolBarBtnComponent = useMemo(
     () => (
       <StyledButton
-        active={isActive || false}
+        active={false}
         disabled={isDisabled}
         iconName={icon}
         label={label}
         onMouseDown={e => {
           e.preventDefault();
-          item.run(view, main, context);
+          item.run(context.view.main, context);
         }}
         title={title}
       />
     ),
-    [isActive, isDisabled],
+    [isDisabled],
   );
 
   return ToolBarBtnComponent;
diff --git a/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js b/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
index c86c8eec4c980c70a9edbafb5eb5649c5ed8290e..75f1b2359b9b7246af15978d2b4604373a71b6b7 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/MultipleDropDownToolGroupService/MultipleDropDown.js
@@ -99,6 +99,10 @@ class MultipleDropDown extends ToolGroup {
       }
     });
 
+    const onChange = option => {
+      this._tools[option.value].run(main, context);
+    };
+
     const MultipleDropDown = useMemo(
       () => (
         <Wrapper key={uuidv4()}>
@@ -106,9 +110,7 @@ class MultipleDropDown extends ToolGroup {
             value={found}
             key={uuidv4()}
             options={dropDownOptions}
-            onChange={option => {
-              this._tools[option.value].run(view, main, context);
-            }}
+            onChange={option => onChange(option)}
             placeholder="Multiple Question Types"
             select={isDisabled}
           />