diff --git a/src/main/webui/src/app/components/content/RemoteView.jsx b/src/main/webui/src/app/components/content/RemoteView.jsx
index c2824d2..bc616bc 100644
--- a/src/main/webui/src/app/components/content/RemoteView.jsx
+++ b/src/main/webui/src/app/components/content/RemoteView.jsx
@@ -86,18 +86,7 @@ export default function RemoteView() {
     return (
       <div className="container-fluid">
         <div className="control-panel">
-          <ControlPanel
-            enabled={!store.disabled}
-            storeObj={store}
-            // storeType="remote"
-            // pkgType={packageType}
-            // storeName={name}
-            // handleEnable={handlers.handleEnable}
-            // handleDisable={handlers.handleDisable}
-            // handleEdit={()=>navigate(`/remote/${pkgType}/edit/${storeName}`)}
-            // handleCreate={handlers.handleCreate}
-            // handleRemove={handlers.handleRemove}
-          />
+          <ControlPanel store={store} />
         </div>
 
         <div className="content-panel">
diff --git a/src/main/webui/src/app/components/content/common/StoreControlPanels.jsx b/src/main/webui/src/app/components/content/common/StoreControlPanels.jsx
index dd052c6..791b1c9 100644
--- a/src/main/webui/src/app/components/content/common/StoreControlPanels.jsx
+++ b/src/main/webui/src/app/components/content/common/StoreControlPanels.jsx
@@ -84,11 +84,17 @@ StoreEditControlPanel.propTypes={
   store: PropTypes.object
 };
 
-const StoreViewControlPanel = function({enabled, storeObj, handleDisable, handleEnable}){
-  const [enableText, enableHandler] = enabled?["Disable",handleDisable]:["Enable",handleEnable];
+const StoreViewControlPanel = function({store}){
+  const handleEnable = () =>{
+    // TODO: need to implement
+  };
+  const handleDisable = () =>{
+    // TODO: need to implement
+  };
+  const [enableText, enableHandler] = store.disabled?["Enable",handleEnable]:["Disable",handleDisable];
   const navigate = useNavigate();
 
-  const [pkgType, storeType, storeName] = [storeObj.packageType, storeObj.type, storeObj.name];
+  const [pkgType, storeType, storeName] = [store.packageType, store.type, store.name];
   const storeUrl = `/api/admin/stores/${pkgType}/${storeType}/${storeName}`;
   const handleRemove = async ()=>{
     const response = await http.delete(storeUrl);
@@ -100,7 +106,7 @@ const StoreViewControlPanel = function({enabled, storeObj, handleDisable, handle
       // TODO: Some other way to show deletion success?
       Utils.logMessage("Store deleted.");
     }
-    navigate(`/${storeObj.type}`);
+    navigate(`/${store.type}`);
   };
 
   return(
@@ -120,10 +126,7 @@ const StoreViewControlPanel = function({enabled, storeObj, handleDisable, handle
 };
 
 StoreViewControlPanel.propTypes={
-  enabled: PropTypes.bool,
-  storeObj: PropTypes.object,
-  handleDisable: PropTypes.func,
-  handleEnable: PropTypes.func
+  store: PropTypes.object
 };
 
 export {StoreEditControlPanel, StoreViewControlPanel};