diff --git a/packages/tdb-dashboard/src/components/AboutDataProduct.js b/packages/tdb-dashboard/src/components/AboutDataProduct.js
index 8ab074c4..d0e8f274 100644
--- a/packages/tdb-dashboard/src/components/AboutDataProduct.js
+++ b/packages/tdb-dashboard/src/components/AboutDataProduct.js
@@ -24,6 +24,8 @@ export const AboutDataProduct = ({dataProductDetails, setShowDeleteModal, setSho
     const {documentClasses,getDocumentClasses} = useTDBDocuments(woqlClient)
     const [radioValue, setRadioValue] = useState(useChangeRequest===false ? "Inactive" : "Active");
 
+
+    const isAdmin = accessControlDashboard ? accessControlDashboard.isAdmin() : false
     const {cloneDatabase, loading:loadingClone, error:errorClone , setError:setCloneError} =  ManageDatabase()
 
     const cloneInTeam = useRef(null);
@@ -38,6 +40,10 @@ export const AboutDataProduct = ({dataProductDetails, setShowDeleteModal, setSho
         return `${localSettings.server}${organization}/${organization}/${dataProduct}`
     }
 
+    useEffect(() =>{
+        setRadioValue(useChangeRequest===false ? "Inactive" : "Active")
+    },[useChangeRequest])
+
     useEffect(() => {
         if(!healthColor) setColor("text-muted")
         if(healthColor == DATA_PRODUCT_HEALTHY) setColor("text-success")
@@ -104,7 +110,7 @@ export const AboutDataProduct = ({dataProductDetails, setShowDeleteModal, setSho
     
     return <React.Fragment> 
         <HealthModal dataProduct={dataProduct} showHealth={showHealth} setShowHealth={setShowHealth}/>
-        {clientUser.serverType !== "TerminusDB" &&
+        {clientUser.serverType !== "TerminusDB" && isAdmin &&
         <Card className="bg-transparent p-1 mb-5 tdb__align__container" border="muted">
             <Card.Body>
             <ButtonGroup>
diff --git a/packages/tdb-dashboard/src/components/IconBar.js b/packages/tdb-dashboard/src/components/IconBar.js
index be8c08b8..94fcc95f 100644
--- a/packages/tdb-dashboard/src/components/IconBar.js
+++ b/packages/tdb-dashboard/src/components/IconBar.js
@@ -8,7 +8,9 @@ import {useParams} from 'react-router-dom'
 
 export const IconBar =  ({setShowFeedbackForm}) => {
 
-     const {currentChangeRequest,useChangeRequest} = WOQLClientObj()
+     const {currentChangeRequest,useChangeRequest, accessControlDashboard} = WOQLClientObj()
+
+     const instanceRead = accessControlDashboard && accessControlDashboard.instanceRead() ? accessControlDashboard.instanceRead() : false
 
     const { organization, dataProduct } = useParams();
 
@@ -66,7 +68,7 @@ export const IconBar =  ({setShowFeedbackForm}) => {
                     {IconBarConfig.dataProductModal.icon}
                 </Nav.Link>
             </Nav.Item>
-            <Nav.Item>
+            {instanceRead && <Nav.Item>
                 <Nav.Link  
                     as={RouterNavLink}
                     title={IconBarConfig.documentExplorer.title} 
@@ -77,7 +79,7 @@ export const IconBar =  ({setShowFeedbackForm}) => {
                     id={IconBarConfig.documentExplorer.key}>
                     {IconBarConfig.documentExplorer.icon}
                 </Nav.Link>
-            </Nav.Item>
+            </Nav.Item>}
           <Nav.Item>
                 <Nav.Link  as={RouterNavLink}
                     title={IconBarConfig.dataProductExplorer.title} 
@@ -90,18 +92,18 @@ export const IconBar =  ({setShowFeedbackForm}) => {
                 </Nav.Link>
             </Nav.Item>
             
-            <Nav.Item>
+            {instanceRead && <Nav.Item>
                 <Nav.Link  as={RouterNavLink}
                     title={IconBarConfig.graphiql.title} 
-                    className="nav-icon nav-product-expolorer" 
+                    className="nav-icon nav-product-expolorer"
                     {...disabled}
                     to={getUrl(IconBarConfig.graphiql.path)} 
                     
                     id={IconBarConfig.graphiql.key}>
                     {IconBarConfig.graphiql.icon}
                 </Nav.Link>
-            </Nav.Item>
-            {useChangeRequest && <Nav.Item>
+            </Nav.Item>}
+            {instanceRead && useChangeRequest && <Nav.Item>
                 <Nav.Link  as={RouterNavLink}
                     title={IconBarConfig.changes.title} 
                     className="nav-icon nav-product-explorer" 
@@ -112,7 +114,8 @@ export const IconBar =  ({setShowFeedbackForm}) => {
                     {IconBarConfig.changes.icon}
                 </Nav.Link>
             </Nav.Item>}
-            {useChangeRequest && !currentChangeRequest &&
+            {instanceRead && useChangeRequest && !currentChangeRequest &&
+                <>
                 <Nav.Item>
                     <Nav.Link  as={RouterNavLink}
                         title={IconBarConfig.openAI.title} 
@@ -124,8 +127,6 @@ export const IconBar =  ({setShowFeedbackForm}) => {
                         {IconBarConfig.openAI.icon}
                     </Nav.Link>
                 </Nav.Item>
-            }
-            {useChangeRequest && !currentChangeRequest  && 
                 <Nav.Item>
                     <Nav.Link  as={RouterNavLink}
                         title={IconBarConfig.search.title} 
@@ -137,9 +138,7 @@ export const IconBar =  ({setShowFeedbackForm}) => {
                         {IconBarConfig.search.icon}
                     </Nav.Link>
                 </Nav.Item>
-            }
-             {useChangeRequest && !currentChangeRequest  && 
-                <Nav.Item>
+                 <Nav.Item>
                     <Nav.Link  as={RouterNavLink}
                         title={IconBarConfig.actions.title} 
                         className="nav-icon nav-product-expolorer" 
@@ -150,6 +149,7 @@ export const IconBar =  ({setShowFeedbackForm}) => {
                         {IconBarConfig.actions.icon}
                     </Nav.Link>
                 </Nav.Item>
+                </>
             }
             <hr className="my-3" role="separator"></hr>
             <div className="nav-icons-bottom">
diff --git a/packages/tdb-dashboard/src/components/OpenAICard.js b/packages/tdb-dashboard/src/components/OpenAICard.js
index 1a6baa1f..b1ce4d66 100644
--- a/packages/tdb-dashboard/src/components/OpenAICard.js
+++ b/packages/tdb-dashboard/src/components/OpenAICard.js
@@ -4,7 +4,7 @@ import {useOpenAI} from "../hooks/useOpenAI"
 import {Alerts} from "./Alerts"
 import {SwitchOpenAi} from "./SwitchOpenAi"
 
-export const OpenAICard=({organization})=>{
+export const OpenAICard=({organization,isAdmin})=>{
 	
 	const {loading,changeOpenAIStatus,
 		 error,saveOpenAIKey,hasOpenAIKEY,hasKey,deleteOpenAIKEY} = useOpenAI()
@@ -25,8 +25,11 @@ export const OpenAICard=({organization})=>{
 		}
 	}
 
-	function deleteKey () { 
-		deleteOpenAIKEY(organization)
+	async function deleteKey () { 
+		const done = await deleteOpenAIKEY(organization)
+		if(done && openAIKEY.current){
+			openAIKEY.current.value = ""
+		}
     }
 
 	function changeStatus (isActive){
@@ -36,7 +39,7 @@ export const OpenAICard=({organization})=>{
 
 	const title = hasKey === false ? "Add your secret OpenAI API key" : "Your OpenAI API key has been set"
     const subTitle= getLabel()
-	
+
 		function getLabel(){
 			if(hasKey === false){
 				return <label className="description text-muted fw-bold">
@@ -45,62 +48,64 @@ export const OpenAICard=({organization})=>{
 			}
 			const label = hasKey === "active" ? "After every change request merge we'll index your documents" : "You have set an OpenAI API key. Please activate this option inorder to index your data"
 			return label
-			return <Stack direction="horizontal" gap={4}>
-					<label className="description text-muted fw-bold mr-auto ">
-						{label}
-							</label>
-					</Stack>
-
+		}
+	const KeyInputComponentInstance = KeyInputComponent()
+		function KeyInputComponent (){
+			if(!isAdmin) return  <div className="form-group">
+								<div className="input-group mt-2 mb-2">
+									<input className="form-control"
+										value= {"xxxxxxxx"}
+										type="password"
+									/>
+								</div>
+								</div>
+			if(hasKey) return <div className="form-group">
+				<div className="input-group mt-2 mb-2">
+					<input className="form-control"
+						value= {"xxxxxxxx"}
+						type="password"
+					/>
+					<div className="input-group-append">
+						{!loading &&  <Button variant="danger" id="delete_openai_key" onClick={deleteKey}>Delete OpenAIKey</Button>}
+						{loading && <button className="btn-lg disabled"><i className="fas fa-spinner fa-spin"></i> 
+						<span style={{marginLeft:"10px"}}>Loading</span></button>}
+					</div>
+				</div>
+				</div>	
+			if(hasKey === false) return <div className="form-group">
+				<div className="input-group mt-2 mb-2">
+					<input className="form-control"
+							id="openAIKEY"
+						ref={openAIKEY}
+						type="password"
+						placeholder="Add your openAI key"
+					/>
+					<div className="input-group-append">
+						{!loading &&  <Button variant="info" id="generate_new_token" onClick={saveOpenAIKeyHandler}> Save OpenAIKey</Button>}
+						{loading && <button className="btn-lg disabled"><i className="fas fa-spinner fa-spin"></i> 
+						<span style={{marginLeft:"10px"}}>Loading</span></button>}
+					</div>
+		
+				</div>
+			</div>
 		}
 
 		return( <React.Fragment>
 				<Card className="p-5 mb-5">
-				<h4 className="mt-4 text-success"><strong>{title}</strong></h4>
+					<h4 className="mt-4 text-success"><strong>{title}</strong></h4>
 						<Stack direction="horizontal" gap={2}>
 							
 							<div>
 								{hasKey !== false && <SwitchOpenAi status={hasKey} 
 									changeOpenAIStatus={changeStatus}
-									title={subTitle}/>}
+									title={subTitle} isAdmin={isAdmin}/>}
 							</div>
 						</Stack>
 					<Row>
-					<Col>
-					{hasKey  && 
-						<div className="form-group">
-						<div className="input-group mt-2 mb-2">
-							<input className="form-control"
-								value= {"xxxxxxxx"}
-								type="password"
-							/>
-							<div className="input-group-append">
-								{!loading &&  <Button variant="danger" id="delete_openai_key" onClick={deleteKey}>Delete OpenAIKey</Button>}
-								{loading && <button className="btn-lg disabled"><i className="fas fa-spinner fa-spin"></i> 
-								<span style={{marginLeft:"10px"}}>Loading</span></button>}
-							</div>
-						</div>
-						</div>	
-					}
-					{hasKey === false &&
-					<div className="form-group">
-						<div className="input-group mt-2 mb-2">
-							<input className="form-control"
-									id="openAIKEY"
-								ref={openAIKEY}
-								type="password"
-								placeholder="Add your openAI key"
-							/>
-							<div className="input-group-append">
-								{!loading &&  <Button variant="info" id="generate_new_token" onClick={saveOpenAIKeyHandler}> Save OpenAIKey</Button>}
-								{loading && <button className="btn-lg disabled"><i className="fas fa-spinner fa-spin"></i> 
-								<span style={{marginLeft:"10px"}}>Loading</span></button>}
-							</div>
-
-						</div>
-					</div>}
-					</Col>
+						<Col>{KeyInputComponentInstance}</Col>
 					</Row>
-			</Card>
+				</Card>
 			</React.Fragment>
 	)
-}
\ No newline at end of file
+}
+
diff --git a/packages/tdb-dashboard/src/components/SwitchOpenAi.js b/packages/tdb-dashboard/src/components/SwitchOpenAi.js
index acab7562..5ec1a5a5 100644
--- a/packages/tdb-dashboard/src/components/SwitchOpenAi.js
+++ b/packages/tdb-dashboard/src/components/SwitchOpenAi.js
@@ -2,7 +2,7 @@
 import React, { useState } from "react"
 import Form from "react-bootstrap/Form";
 
-export function SwitchOpenAi({ status, changeOpenAIStatus, title }) {
+export function SwitchOpenAi({ status, changeOpenAIStatus, title, isAdmin }) {
 
   const [currentStatus,setStatus] = useState(status === "active" ? true : false)
   
@@ -14,14 +14,18 @@ export function SwitchOpenAi({ status, changeOpenAIStatus, title }) {
 
   return <Form>
     <div key={`default-checkbox`} className="mb-3">
-      <Form.Check // prettier-ignore
+      {isAdmin && <Form.Check // prettier-ignore
         type={`checkbox`}
         id={`default-checkbox`}
         className="openai_checkbox"
         label={title}
         checked={currentStatus}
         onChange={onChange}
-      />
+      />}
+      {!isAdmin && <div class="mb-3"><div class="openai_checkbox form-check">
+        <label title="" for="default-checkbox" class="form-check-label">{title}</label>
+        </div>
+      </div>}
     </div>
   </Form>
   
diff --git a/packages/tdb-dashboard/src/hooks/useOpenAI.js b/packages/tdb-dashboard/src/hooks/useOpenAI.js
index ffb0a81b..bee46b13 100644
--- a/packages/tdb-dashboard/src/hooks/useOpenAI.js
+++ b/packages/tdb-dashboard/src/hooks/useOpenAI.js
@@ -71,11 +71,13 @@ export function useOpenAI(){
     }
 
     ///changes/:orgid/:dbid/indexedcommit
-    const getSearchableCommit = async (limit=1, status=null)=>{
+    const getSearchableCommit = async (limit=1, status=null, branch=null)=>{
         try{
-            setSearchableCommit(false)
             setLoading(true)
-            const url = `${getUrl('indexes')}?limit=${limit}&status=${status}`
+            setSearchableCommit(false)
+            const statusQuery = status ? `&status=${status}` : ''
+            const branchQuery = branch ? `&branch=${branch}` : ''
+            const url = `${getUrl('indexes')}?limit=${limit}${statusQuery}${branchQuery}`
             const result = await woqlClient.sendCustomRequest("GET", url)
             if(result && result.bindings){
                 setSearchableCommit(result.bindings)
@@ -88,13 +90,13 @@ export function useOpenAI(){
         }
     }
 
-    const getResearchResult = async (commit, freeText, domain, branch = "main"  ) =>{
+    const getResearchResult = async (commit, freeText) =>{
         if(woqlClient){
             try{
-                setSearchResult(false)
                 setLoading(true)
+                setSearchResult(false)
                 localStorage.setItem(`${location.pathname}___SEARCH__TEXT`,freeText)
-                const url = `${getUrl('indexes')}/search?domain=${domain}&commit=${commit}`
+                const url = `${getUrl('indexes')}/search?commit=${commit}`
                 const result = await woqlClient.sendCustomRequest("POST", url , {search:freeText})
                 localStorage.setItem(`${location.pathname}___SEARCH__RESULT`,JSON.stringify(result))
                 setSearchResult(result)
@@ -184,6 +186,7 @@ export function useOpenAI(){
                 const url = `${client.server()}api/private/organizations/${UTILS.encodeURISegment(orgName)}/openaikey`
                 const keyStatusObj = await client.sendCustomRequest("DELETE", url)
                 setHasKey(keyStatusObj.key)
+                return keyStatusObj
             }catch(err){
                setError() 
             }finally{
@@ -297,11 +300,14 @@ export function useOpenAI(){
     const getPrewiew = async (type,queryStr,handlebarsTemplate)=>{
       try{
          setError(false)
-         let queryWithLimit = queryStr//.replace("(","($offset: Int, $limit: Int , ")
-        // queryWithLimit = queryWithLimit.replace(`${type}(`,`${type}(offset: $offset, limit: $limit, `)
+         let queryWithLimit = queryStr  
+         if(queryStr.indexOf("$limit") === -1){
+            queryWithLimit = queryStr.replace("(","($offset: Int, $limit: Int, ")
+            queryWithLimit = queryWithLimit.replace(`${type}(`,`${type}(offset: $offset, limit: $limit, `)
+         }
          setLoading(true)
          const query = gql(`${queryWithLimit}`)
-         const result = await apolloClient.query({query:query,variables:{limit:5,offset:0}})
+         const result = await apolloClient.query({query:query,variables:{limit:10,offset:0}})
          
          if(result.errors){
             setError(result.errors)
diff --git a/packages/tdb-dashboard/src/pages/DocumentEdit.js b/packages/tdb-dashboard/src/pages/DocumentEdit.js
index 7e17554e..e67cc824 100644
--- a/packages/tdb-dashboard/src/pages/DocumentEdit.js
+++ b/packages/tdb-dashboard/src/pages/DocumentEdit.js
@@ -37,7 +37,7 @@ export const DocumentEdit = () => {
    }
     // implement the chage method
     useEffect(() => {
-        if(!currentChangeRequest){
+        if(useChangeRequest && !currentChangeRequest){
             setShowModal(true)
         }
         getDocumentFrames()
@@ -53,7 +53,7 @@ export const DocumentEdit = () => {
     return <React.Fragment>
         {error && <ErrorMessageReport error={error} setError={setError}/>}
         {showModal && <CreateChangeRequestModal showModal={showModal} type={type}  setShowModal={setShowModal}  updateViewMode={setChangeRequestBranch}/>}
-        {!useChangeRequest || currentChangeRequest && 
+        {(!useChangeRequest || currentChangeRequest) && 
             <EditDocumentComponent
                 SearchComponent={DocumentSearchComponent}
                 documentID={documentID} 
diff --git a/packages/tdb-dashboard/src/pages/DocumentView.js b/packages/tdb-dashboard/src/pages/DocumentView.js
index 77407350..6c786b57 100644
--- a/packages/tdb-dashboard/src/pages/DocumentView.js
+++ b/packages/tdb-dashboard/src/pages/DocumentView.js
@@ -97,7 +97,7 @@ export const DocumentView = () => {
             deleteDocument={callDeleteDocument}
             documentID={documentID}
             showDeleteModal={showDeleteModal}
-            handleClose={()=>showDeleteModal(false)}
+            handleClose={()=>setShowDeleteModal(false)}
         /> }
         <ViewDocumentComponent 
           type={type}
diff --git a/packages/tdb-dashboard/src/pages/DocumentsGraphqlList.js b/packages/tdb-dashboard/src/pages/DocumentsGraphqlList.js
index 1c1ae6b6..12e3f072 100644
--- a/packages/tdb-dashboard/src/pages/DocumentsGraphqlList.js
+++ b/packages/tdb-dashboard/src/pages/DocumentsGraphqlList.js
@@ -11,7 +11,7 @@ import {ErrorMessageReport} from "../components/ErrorMessageReport"
 // I pass this so I'm sure it exists before loading the component
 export const DocumentsGraphqlList = ({documentTablesConfig}) => {    
     const {type} = useParams()
-    const {apolloClient,branch,setChangeRequestBranch,woqlClient,ref} = WOQLClientObj()
+    const {apolloClient,branch,setChangeRequestBranch,woqlClient,ref,currentChangeRequest,useChangeRequest} = WOQLClientObj()
     const {deleteDocument,loading,error,setError} = useTDBDocuments(woqlClient)
     const [showCRModal, setShowCRModal] = useState(false)
     const [showDeleteModal, setShowDeleteModal]=useState(false)
@@ -29,7 +29,7 @@ export const DocumentsGraphqlList = ({documentTablesConfig}) => {
         setTobeDeleted(fullId)
         // I can not change main directly
         // I can change other branches creates with create branch interface
-        if(woqlClient.checkout() === "main"){
+        if(useChangeRequest && !currentChangeRequest){
             setShowCRModal(true)
         }else setShowDeleteModal(true)
     }
diff --git a/packages/tdb-dashboard/src/pages/FreeTextSearch.js b/packages/tdb-dashboard/src/pages/FreeTextSearch.js
index 7003394c..df553c48 100644
--- a/packages/tdb-dashboard/src/pages/FreeTextSearch.js
+++ b/packages/tdb-dashboard/src/pages/FreeTextSearch.js
@@ -2,7 +2,6 @@ import React, {useState,useEffect,useRef} from "react";
 import Form from "react-bootstrap/Form"
 import { Layout } from "./Layout";
 import Button from "react-bootstrap/Button";
-import {WOQLClientObj} from '../init-woql-client'
 import Accordion from 'react-bootstrap/Accordion'
 import Stack from 'react-bootstrap/Stack'
 import { useOpenAI } from "../hooks/useOpenAI";
@@ -17,9 +16,10 @@ import { DisplayNoIndexingAction } from "../components/DisplayNoIndexingAction";
 import { BsSearch } from "react-icons/bs"
 import InputGroup from 'react-bootstrap/InputGroup';
 import {FiAlertTriangle} from 'react-icons/fi'
-
+import { WOQLClientObj } from "../init-woql-client";
 
 export function FreeTextSearch() {
+    const {branch} = WOQLClientObj()
     const {resetSearch,hasOpenAIKEY,
          getSearchableCommit, searchableCommit, 
          searchResult,
@@ -42,7 +42,7 @@ export function FreeTextSearch() {
         setElements([])
         resetSearch()
         hasOpenAIKEY(organization)
-        getSearchableCommit(1, "Assigned")
+        getSearchableCommit(1, "Assigned",branch)
     },[dataProduct])
 
     const onClickHandler = ()=>{
@@ -50,7 +50,7 @@ export function FreeTextSearch() {
         if(freeText=== ""){
             setError("Please enter the search data")
         }else {
-            getResearchResult (commit, freeText, `${organization}/${dataProduct}`  )
+            getResearchResult (commit, freeText)
         }
     }
     
@@ -100,13 +100,14 @@ export function FreeTextSearch() {
 
             </div>}
             <Container className="mt-4">
-                {!commit  && <DisplayNoIndexingAction helpDescription={`You need to index your data before you can search`}/>/*<Alert type="Info" >
+                {loading && <Loading>Search Documents</Loading>}
+                {!loading && !commit  && <DisplayNoIndexingAction helpDescription={`You need to index your data before you can search`}/>/*<Alert type="Info" >
                     <h3>You need to index your data before you can search</h3>
                     <p>if you haven't already done it, Go to <NavLink to={`/${organization}/profile`}>Profile page</NavLink> and add an OpenAi Key to your team,</p> 
                     after you can start to index your data using the change request workflow
                 </Alert>*/}
                 {error &&  <ErrorMessageReport error={error} setError={setError}/> }
-                {loading && <Loading>Search Documents</Loading>}
+               
                 {searchResult && 
                     <React.Fragment>
                     <div className="w-100 d-flex justify-content-center">
diff --git a/packages/tdb-dashboard/src/pages/GraphqlHandlerbarsPage.js b/packages/tdb-dashboard/src/pages/GraphqlHandlerbarsPage.js
index 69849701..76c3cafa 100644
--- a/packages/tdb-dashboard/src/pages/GraphqlHandlerbarsPage.js
+++ b/packages/tdb-dashboard/src/pages/GraphqlHandlerbarsPage.js
@@ -135,7 +135,7 @@ export function GraphqlHandlerbarsPage({}) {
                 <Card className="h-100">
                     <Card.Header className="bg-transparent">
                         <Stack direction="horizontal" gap={1}>
-                            Preview
+                            Preview - showing only the first 10 results
                             <CopyButton text={queryResultPreviewString} title="Copy result obj" css={"ml-auto btn btn-md bg-light text-dark float-right"}/>
                          </Stack>
                     </Card.Header>
diff --git a/packages/tdb-dashboard/src/pages/IndexingActionMonitor copy.js b/packages/tdb-dashboard/src/pages/IndexingActionMonitor copy.js
deleted file mode 100644
index e37dece4..00000000
--- a/packages/tdb-dashboard/src/pages/IndexingActionMonitor copy.js	
+++ /dev/null
@@ -1,93 +0,0 @@
-import React, {useEffect, useState} from "react";
-import {Container , Card, Button, ListGroup,Badge} from "react-bootstrap"
-import {useParams} from "react-router-dom";
-import {Loading} from "../components/Loading" 
-import {extractID, getDays} from "../components/utils"
-import { Layout } from "./Layout";
-import { useOpenAI } from "../hooks/useOpenAI";
-import {AiFillCheckCircle, AiFillCloseCircle, AiFillClockCircle} from "react-icons/ai"
-import {ImSpinner5} from "react-icons/im"
-
-export const IndexingActionMonitor=(props)=>{
-
-    const {loading,error,getSearchableCommit,searchableCommit} = useOpenAI()
-    const {dataProduct} = useParams()
-    useEffect(()=>{
-        getSearchableCommit(10)  
-    },[dataProduct])
-
-    const formatListItem=()=>{
-        if(searchableCommit.lenght === 0) return <ListGroup.Item  className="d-flex justify-content-between align-items-start">
-            No running actions 
-        </ListGroup.Item>
-        let display= searchableCommit.map((item,index)=>{
-			//statusCount+=1
-			return  <ItemElement  key={`item___${index}`} item={item}/>
-        })
-		return display
-    }
-
-	return <Layout>  
-            <div className="content mr-3 ml-5">  
-                <div className="mt-5 mb-5 mr-5">
-                    <Card>
-                        <Card.Header>
-                            Indexing Actions
-                        </Card.Header>
-                        <Card.Body className="p-0">
-                            <ListGroup as="ol" key={"ListGroup"}> 
-                                {loading && <Loading message={`Fetching Change Requests ...`}/>}
-                                {searchableCommit && formatListItem()}
-                            </ListGroup>
-                        </Card.Body>
-                    </Card>
-                </div>
-            </div>
-        </Layout>
-}
-
-const endStatus = {"Assigned":true, "Error":true}
-
-function ItemElement ({item}){
-    const startstatus = extractID(item.indexing_status || "")
-    const index = extractID(item.index || "")
-    const [status , setStatus] = useState(startstatus)
-    const {pollingCall} = useOpenAI()
-
-    const updateStatus = (doc) =>{
-        item.indexing_status = `@schema:Indexing_Status/${doc.indexing_status}`
-        setStatus(doc.indexing_status)
-    }
-    useEffect(()=>{
-        if(!endStatus[startstatus]){
-            pollingCall(index, updateStatus)
-        }
-    },[item.index])
-
-    const iconTypes = {'Assigned':<AiFillCheckCircle className="text-success" size="20px"/>,
-                       'Progress':<ImSpinner5 className="text-warning loading-icon" size="20px"/>,
-                       'Error':<AiFillCloseCircle className="text-danger" size="20px"/>,
-                       'Complete':<AiFillClockCircle className="text-success" size="20px"/>}
-
-    const name  = item.name ? item.name['@value'] : ''
-    
-           //"@schema:Indexing_Status/Progress" 
-    const message  = "no message" //item.messages[0].text || '' //item[tracking_branch]
-		return  <ListGroup.Item  className="d-flex justify-content-between align-items-start">
-					{iconTypes[status]}
-					<div className="ms-2 me-auto">
-						<div className="fw-bold text-success">
-							Change request 
-							<span class="text-dark ml-1 badge bg-light mr-1">{name || item.tracking_branch["@value"]}</span>
-						 		from branch 
-							<span class="text-dark ml-1 badge bg-success">{item.branch["@value"]}</span>
-						
-						</div>					
-						<small className="text-light text-small fw-bold">
-							runned {getDays(item.time["@value"])} days ago 
-						</small>
-                       
-					</div>
-                    {status=== "Assigned" && <span class="text-dark ml-1 badge bg-light mr-1">{item.searchable_commit["@value"]}</span>}
-		    </ListGroup.Item>
-}
\ No newline at end of file
diff --git a/packages/tdb-dashboard/src/pages/IndexingActionMonitor.js b/packages/tdb-dashboard/src/pages/IndexingActionMonitor.js
index c98684e6..22f252e1 100644
--- a/packages/tdb-dashboard/src/pages/IndexingActionMonitor.js
+++ b/packages/tdb-dashboard/src/pages/IndexingActionMonitor.js
@@ -10,7 +10,6 @@ import {ImSpinner5} from "react-icons/im"
 import { useParams } from "react-router-dom";
 import { DisplayNoIndexingAction } from "../components/DisplayNoIndexingAction"
 
-
 export const IndexingActionMonitor=(props)=>{
 
     const {loading,error,getSearchableCommit,searchableCommit} = useOpenAI()
@@ -28,23 +27,22 @@ export const IndexingActionMonitor=(props)=>{
 		return display
     }
 
-    
-
 	return <Layout>  
             <div className="content mr-3 ml-5">  
                 <div className="mb-5">
-                    {!searchableCommit.length && <DisplayNoIndexingAction helpDescription={`You need to index your data before any index actions appear on this page`}/>}
+                    {loading && <Loading message={`Fetching Indexing Actions ...`}/>}
                     {searchableCommit.length>0 && <Card>
                         <Card.Header>
                             Indexing Actions
                         </Card.Header>
                         <Card.Body className="p-0">
                             <ListGroup as="ol" key={"ListGroup"}> 
-                                {loading && <Loading message={`Fetching Change Requests ...`}/>}
+                                
                                 {searchableCommit && formatListItem()}
                             </ListGroup>
                         </Card.Body>
                     </Card>}
+                    {!loading && searchableCommit && searchableCommit.length === 0 && <DisplayNoIndexingAction helpDescription={`You need to index your data before any index actions appear on this page`}/>}
                 </div>
             </div>
         </Layout>
@@ -93,16 +91,19 @@ function ItemElement ({item}){
 						 		from branch 
 							<span class="text-dark ml-1 badge bg-success">{item.branch["@value"]}</span>
 						
-						</div>					
+						</div>
+                        {status === "Error" && item.error_message && 
+                        <div sclassName="text-danger text-small fw-bold ml-4">Error: {item.error_message["@value"]}</div>}			
 						<small className="text-light text-small fw-bold">
-							runned {getDays(item.time["@value"])} days ago 
+							ran {getDays(item.time["@value"])} days ago 
 						</small>
                        
+                       
 					</div>
                     {status === "Progress" &&  
                         <Button variant="dark" onClick={(e) => changeStatusHandler("Close")} className="bg-warning text-dark mr-4">   
                             <small className="text-gray fw-bold">
-                                <span >Restart</span>
+                                <span >Stop</span>
                             </small>
                         </Button>
                     }
@@ -110,6 +111,7 @@ function ItemElement ({item}){
                     <Stack direction="horizontal" gap={3}>
                         {status=== "Assigned" && 
                         <span class="text-dark ml-1 badge bg-light mr-1">{item.searchable_commit["@value"]}</span>}
+                       
                         <Button variant="dark" onClick={(e) => changeStatusHandler("Sent")} className="bg-success text-dark mr-4">   
                             <small className="text-gray fw-bold">
                                 <span >Restart</span>
diff --git a/packages/tdb-dashboard/src/pages/Profile.js b/packages/tdb-dashboard/src/pages/Profile.js
index e84d3b9f..ed6fa273 100644
--- a/packages/tdb-dashboard/src/pages/Profile.js
+++ b/packages/tdb-dashboard/src/pages/Profile.js
@@ -25,7 +25,7 @@ import {useNavigate} from "react-router-dom"
 import { PLANS } from "../routing/constants"
 
 export const Profile = () => {
-    const {woqlClient,clientUser:user} = WOQLClientObj()
+    const {woqlClient,clientUser:user,accessControlDashboard} = WOQLClientObj()
     if(!woqlClient) return
     const organization = woqlClient.organization()
     //const team = user ? user['http://terminusdb.com/schema/system#team'] : ''
@@ -57,7 +57,7 @@ export const Profile = () => {
             {user &&
             <Row>
             <Col className="ml-3 mt-5">
-                <OpenAICard organization={organization}/>
+                <OpenAICard organization={organization} isAdmin={accessControlDashboard && accessControlDashboard.isAdmin()}/>
                 <TokenCard organization={organization}/>
                 {cloud_url && <React.Fragment>
                     <Card className="p-5 mb-4">