diff --git a/modules/dreamview/frontend/src/components/RouteEditingBar/index.js b/modules/dreamview/frontend/src/components/RouteEditingBar/index.js
index a932aa3274c760117077e98b09a80d25a09efcd7..a9e998d1dfa90d43a314655eecc6afbfe360726f 100644
--- a/modules/dreamview/frontend/src/components/RouteEditingBar/index.js
+++ b/modules/dreamview/frontend/src/components/RouteEditingBar/index.js
@@ -33,7 +33,7 @@ export default class RouteEditingMenu extends React.Component {
                     <RouteEditingButton label="Add Point of Interest"
                                         icon={addPoiIcon}
                                         onClick={() => {
-                                            this.props.store.handleSideBarClick('showPOI');
+                                            this.props.store.handleOptionToggle('showPOI');
                                         }}/>
                     <RouteEditingButton label="Remove Last Point"
                                         icon={removeLastIcon}
diff --git a/modules/dreamview/frontend/src/components/SideBar/index.js b/modules/dreamview/frontend/src/components/SideBar/index.js
index 3e305eb68ca8c04eb72b1977d21ae504061468f2..57a671ce62e2b19404b99339262a2c8ec33cb37c 100644
--- a/modules/dreamview/frontend/src/components/SideBar/index.js
+++ b/modules/dreamview/frontend/src/components/SideBar/index.js
@@ -14,30 +14,30 @@ export default class SideBar extends React.Component {
             <div className="side-bar">
                 <ButtonPanel enableHMIButtonsOnly={enableHMIButtonsOnly}
                              onTasks={() => {
-                                this.props.store.handleSideBarClick('showTasks');
+                                this.props.store.handleOptionToggle('showTasks');
                              }}
                              showTasks={options.showTasks}
                              onModuleController={() => {
-                                this.props.store.handleSideBarClick('showModuleController');
+                                this.props.store.handleOptionToggle('showModuleController');
                              }}
                              showModuleController={options.showModuleController}
                              onMenu={() => {
-                                    this.props.store.handleSideBarClick('showMenu');
+                                    this.props.store.handleOptionToggle('showMenu');
                                  }}
                              showMenu={options.showMenu}
                              onRouteEditingBar={() => {
-                                    this.props.store.handleSideBarClick('showRouteEditingBar');
+                                    this.props.store.handleOptionToggle('showRouteEditingBar');
                                  }}
                              showRouteEditingBar={options.showRouteEditingBar}
                              onDataRecorder={() => {
-                                    this.props.store.handleSideBarClick('showDataRecorder');
+                                    this.props.store.handleOptionToggle('showDataRecorder');
                                  }}
                              showDataRecorder={options.showDataRecorder} />
                 <SubButtonPanel enablePOI={
                                     !enableHMIButtonsOnly && !options.showRouteEditingBar
                                 }
                                 onPOI={() => {
-                                    this.props.store.handleSideBarClick('showPOI');
+                                    this.props.store.handleOptionToggle('showPOI');
                                 }}
                                 showPOI={!options.showRouteEditingBar && options.showPOI} />
             </div>
diff --git a/modules/dreamview/frontend/src/components/Tasks/Others.js b/modules/dreamview/frontend/src/components/Tasks/Others.js
index 21438e62ed8b7fb8b64f61ecb3a50ec37a7b83ec..606c0598eac3e59b7851e568c314e57c35ca4055 100644
--- a/modules/dreamview/frontend/src/components/Tasks/Others.js
+++ b/modules/dreamview/frontend/src/components/Tasks/Others.js
@@ -29,14 +29,14 @@ export default class Others extends React.Component {
                                   isChecked={options.showVideo}
                                   disabled={disablePanel}
                                   onClick={() => {
-                                      options.toggleSideBar("showVideo");
+                                      this.props.store.handleOptionToggle('showVideo');
                                   }}/>
                     <CheckboxItem id={"showPNCMonitor"}
                                   title={"PNC Monitor"}
                                   isChecked={options.showPNCMonitor}
                                   disabled={disablePanel}
                                   onClick={() => {
-                                      this.props.store.handleSideBarClick('showPNCMonitor');
+                                      this.props.store.handleOptionToggle('showPNCMonitor');
                                   }}/>
                     <CheckboxItem id={"panelLock"}
                                   title={"Lock Task Panel"}
@@ -49,7 +49,7 @@ export default class Others extends React.Component {
                                   disabled={false}
                                   onClick={() => {
                                       WS.toggleSimControl(!options.simControlEnabled);
-                                      options.toggleSideBar("simControlEnabled");
+                                      this.props.store.handleOptionToggle('simControlEnabled');
                                   }}/>
                 </div>
             </div>
diff --git a/modules/dreamview/frontend/src/store/index.js b/modules/dreamview/frontend/src/store/index.js
index 0dab245041940ec70d091fe8a7dbb37b78f6b2ee..caaa3c4b096610fde26b20c12bd97d0a49fb92e8 100644
--- a/modules/dreamview/frontend/src/store/index.js
+++ b/modules/dreamview/frontend/src/store/index.js
@@ -108,11 +108,11 @@ class DreamviewStore {
         }
     }
 
-    handleSideBarClick(option) {
+    handleOptionToggle(option) {
         const oldShowPNCMonitor = this.options.showPNCMonitor;
         const oldShowRouteEditingBar = this.options.showRouteEditingBar;
 
-        this.options.toggleSideBar(option);
+        this.options.toggle(option);
 
         // disable tools turned off after toggling
         if (oldShowPNCMonitor && !this.options.showPNCMonitor) {
diff --git a/modules/dreamview/frontend/src/store/options.js b/modules/dreamview/frontend/src/store/options.js
index 8c1bcc5a6c4d1b603edfbea03bcefe31b1a0dae9..9fd0fb9aa28196a0c4d25792951f541acd4c214f 100644
--- a/modules/dreamview/frontend/src/store/options.js
+++ b/modules/dreamview/frontend/src/store/options.js
@@ -71,7 +71,7 @@ export default class Options {
                this.cameraAngle === 'Monitor';
     }
 
-    @action toggleSideBar(option) {
+    @action toggle(option) {
         this[option] = !this[option];
 
         // Disable other mutually exclusive options
@@ -90,10 +90,6 @@ export default class Options {
         }
     }
 
-    @action toggle(option) {
-        this[option] = !this[option];
-    }
-
     @action selectCamera(option) {
         this.cameraAngle = option;
     }