diff --git a/mscr-ui/public/locales/en/common.json b/mscr-ui/public/locales/en/common.json
index 836740b16..e3c300e11 100644
--- a/mscr-ui/public/locales/en/common.json
+++ b/mscr-ui/public/locales/en/common.json
@@ -29,7 +29,7 @@
     "finish-editing": "Finish editing",
     "invalidate-crosswalk": "Invalidate crosswalk",
     "invalidate-schema": "Invalidate schema",
-    "mscr-copy": "Covert to MSCR Format",
+    "mscr-copy": "Make a MSCR Copy",
     "publish-crosswalk": "Publish crosswalk",
     "publish-schema": "Publish schema",
     "revision": "Add new revision",
@@ -91,7 +91,7 @@
       "crosswalk-create": "Create Crosswalk",
       "crosswalk-register": "Register Crosswalk",
       "crosswalk-revision": "Register revision",
-      "mscr-copy": "Convert to MSCR Format",
+      "mscr-copy": "MSCR Copy",
       "schema-register": "Register Schema",
       "schema-revision": "Register revision"
     },
@@ -109,7 +109,7 @@
       "crosswalk-mscr-copy": "Register MSCR copy of crosswalk",
       "crosswalk-register": "Register existing crosswalk",
       "crosswalk-revision": "Register revision of crosswalk",
-      "schema-mscr-copy": "Convert Schema to MSCR Format",
+      "schema-mscr-copy": "Make a MSCR copy",
       "schema-register": "Register schema",
       "schema-revision": "Register revision of schema"
     },
@@ -278,7 +278,7 @@
     "add-schema": "New schema added",
     "add-schema-revision": "New schema version added",
     "copy-crosswalk": "MSCR copy of crosswalk added",
-    "copy-schema": "Schema is converted to MSCR format",
+    "copy-schema": "MSCR copy of schema added",
     "crosswalk-deleted": "Crosswalk was removed",
     "crosswalk-deprecated": "Crosswalk deprecated",
     "crosswalk-invalidated": "Crosswalk invalidated",
diff --git a/mscr-ui/src/common/components/schema-info/index.tsx b/mscr-ui/src/common/components/schema-info/index.tsx
index b6baff4ce..637ea0bea 100644
--- a/mscr-ui/src/common/components/schema-info/index.tsx
+++ b/mscr-ui/src/common/components/schema-info/index.tsx
@@ -71,8 +71,6 @@ export default function SchemaInfo(props: {
       generatedTree.then((res) => {
         if (res) {
           setTreeDataOriginal(res);
-          // Expand tree when data is loaded
-          setPartlyExpanded();
           setTreeData(res);
           setTreeDataFetched(true);
           setNodeIdToNodeDictionary(nodeIdToShallowNode);
@@ -82,11 +80,6 @@ export default function SchemaInfo(props: {
     }
   }, [getSchemaDataIsSuccess, getSchemaData]);
 
-  // Expand tree when data is loaded
-  useEffect(() => {
-    setPartlyExpanded();
-  }, [isTreeDataFetched]);
-
   // Expand and select nodes when input changed (from mappings accordion)
   useEffect(() => {
     if (props.treeSelection) {
@@ -108,39 +101,32 @@ export default function SchemaInfo(props: {
     setSelectedTreeNodes(selectedNodes);
   }, [treeSelectedArray, nodeIdToNodeDictionary]);
 
-  const setPartlyExpanded = () => {
+  const setFullyExpanded = () => {
     const nodeIdsToExpand: string[] = [];
-    treeData.forEach(({ children, id }) => {
-      if (children && children.length > 0) {
-        nodeIdsToExpand.push(id);
-        if (children.length === 1) {
-          nodeIdsToExpand.push(children[0].id);
-        }
-      }
+    Object.entries(nodeIdToNodeDictionary).map(([nodeId, node]) => {
+      if (node.some((n) => n.children.length > 0)) nodeIdsToExpand.push(nodeId);
     });
     setTreeExpandedArray(nodeIdsToExpand);
   };
 
   function clearTreeSearch() {
     setTreeSelectedArray([]);
-    setPartlyExpanded();
     setSelectedTreeNodes([]);
   }
 
   // Used by tree select and filtering
   function getAllNodeIdsOnPathToLeaf(nodeIds: string[]) {
-    const elementPaths: string[] = [];
+    let idsOnPath: string[] = [];
     nodeIds.forEach((nodeId) => {
       const nodes = nodeIdToNodeDictionary[nodeId];
-      nodes.map((node) => elementPaths.push(node.elementPath));
+      nodes.map((node) => {
+        idsOnPath = idsOnPath.concat(node.rootPathIds);
+      });
     });
 
     const nodesToSelect: Set<string> = new Set();
-    elementPaths.forEach((path) => {
-      const nodeIdsOnPath = path.split('.');
-      nodeIdsOnPath.forEach((nodeId) => {
-        nodesToSelect.add(nodeId);
-      });
+    idsOnPath.forEach((pathNodeId) => {
+      nodesToSelect.add(pathNodeId);
     });
 
     return Array.from(nodesToSelect);
@@ -148,7 +134,7 @@ export default function SchemaInfo(props: {
 
   const handleExpandClick = () => {
     if (treeExpandedArray.length === 0) {
-      setPartlyExpanded();
+      setFullyExpanded();
     } else {
       setTreeExpandedArray([]);
     }
@@ -321,7 +307,7 @@ export default function SchemaInfo(props: {
             >
               {isTreeDataFetched && (
                 <SchemaTree
-                  nodes={treeData[0]}
+                  nodes={treeData}
                   treeSelectedArray={treeSelectedArray}
                   treeExpanded={treeExpandedArray}
                   performTreeAction={performCallbackFromTreeAction}
diff --git a/mscr-ui/src/common/components/schema-info/schema-tree/index.tsx b/mscr-ui/src/common/components/schema-info/schema-tree/index.tsx
index b72b8875a..758f8b0fb 100644
--- a/mscr-ui/src/common/components/schema-info/schema-tree/index.tsx
+++ b/mscr-ui/src/common/components/schema-info/schema-tree/index.tsx
@@ -48,7 +48,7 @@ export default function SchemaTree({
   showQname,
   isSourceTree,
 }: {
-  nodes: RenderTree;
+  nodes: RenderTree[];
   treeSelectedArray: string[];
   treeExpanded: string[];
   performTreeAction: (action: string, nodeIds: string[]) => void;
@@ -78,16 +78,7 @@ export default function SchemaTree({
       defaultExpandIcon={<ChevronRightIcon />}
       multiSelect
     >
-      <TreeItem
-        key={nodes.visualTreeId}
-        nodeId={nodes.id}
-        label={nodes.name}
-        className="linked-tree-item"
-      >
-        {Array.isArray(nodes.children)
-          ? nodes.children.map((node: RenderTree) => toTree(node, showQname))
-          : null}
-      </TreeItem>
+      {nodes.map((node: RenderTree) => toTree(node, showQname))}
     </TreeView>
   );
 }
diff --git a/mscr-ui/src/common/components/schema-info/schema-tree/node-info/index.tsx b/mscr-ui/src/common/components/schema-info/schema-tree/node-info/index.tsx
index fd99692e7..a7400c67c 100644
--- a/mscr-ui/src/common/components/schema-info/schema-tree/node-info/index.tsx
+++ b/mscr-ui/src/common/components/schema-info/schema-tree/node-info/index.tsx
@@ -132,7 +132,6 @@ export default function NodeInfo(props: {
           )}
           {props.isNodeEditable &&
             selectedNode &&
-            selectedNode?.elementPath !== 'ROOT' &&
             !isLeafNode &&
             !props.hasCustomRoot && (
               <Button
diff --git a/mscr-ui/src/common/components/schema-info/schema-tree/schema-tree-renderer/index.tsx b/mscr-ui/src/common/components/schema-info/schema-tree/schema-tree-renderer/index.tsx
index b7fc8b64b..5e13baa22 100644
--- a/mscr-ui/src/common/components/schema-info/schema-tree/schema-tree-renderer/index.tsx
+++ b/mscr-ui/src/common/components/schema-info/schema-tree/schema-tree-renderer/index.tsx
@@ -1,231 +1,22 @@
-import {RenderTree, RenderTreeOld} from '@app/common/interfaces/crosswalk-connection.interface';
-
-// export default function MockupSchemaLoader(emptyTemplate: boolean): Promise<RenderTree[] | undefined> {
-//
-//     let allTreeNodes: RenderTreeOld[] = [];
-//
-//     let currentTreeNode: RenderTreeOld = {
-//         idNumeric: 0,
-//         id: '0',
-//         name: '',
-//         isLinked: false,
-//         title: '',
-//         type: '',
-//         description: '',
-//         required: '',
-//         isMappable: '',
-//         parentName: '',
-//         jsonPath: '$schema',
-//         parentId: 0,
-//         children: []
-//     };
-//
-//     let nodeId = 0;
-//
-//     function increaseNodeNumber() {
-//         nodeId += 1;
-//     }
-//
-//     function createTreeObject(object: string, value: string, parent: string, rootId: any, jsonPath: string) {
-//         currentTreeNode.jsonPath = jsonPath + '.' + object;
-//         currentTreeNode.idNumeric = nodeId;
-//         currentTreeNode.id = nodeId.toString();
-//         currentTreeNode.parentId = rootId;
-//         currentTreeNode.name = object;
-//         currentTreeNode.title = value;
-//         currentTreeNode.parentName = parent;
-//         increaseNodeNumber();
-//     }
-//
-//     function walkJson(json_object: any, parent: any, rootId: number, jsonPath: string) {
-//         for (const obj in json_object) {
-//             if (typeof json_object[obj] === 'string') {
-//                 //console.log(`leaf ${obj} = ${json_object[obj]}`);
-//
-//                 // OBJECT IS A LEAF LEVEL OBJECT
-//                 currentTreeNode = {
-//                     isLinked: false,
-//                     idNumeric: 0,
-//                     id: '0',
-//                     name: '',
-//                     title: '',
-//                     type: 'string',
-//                     description: '',
-//                     required: '',
-//                     parentId: 0,
-//                     jsonPath,
-//                     children: []
-//                 };
-//                 createTreeObject(obj, json_object[obj], parent, rootId, jsonPath);
-//                 allTreeNodes.push(cloneDeep(currentTreeNode));
-//             } else {
-//                 // OBJECT HAS CHILDREN
-//                 currentTreeNode = {
-//                     isLinked: false,
-//                     idNumeric: 0,
-//                     id: '0',
-//                     name: '',
-//                     title: '',
-//                     type: Array.isArray(json_object[obj]) ? 'array' : 'composite',
-//                     description: '',
-//                     required: '',
-//                     parentId: 0,
-//                     jsonPath,
-//                     children: []
-//                 };
-//                 currentTreeNode.name = obj;
-//                 currentTreeNode.parentName = parent;
-//                 currentTreeNode.parentId = rootId;
-//                 currentTreeNode.idNumeric = nodeId;
-//                 currentTreeNode.id = nodeId.toString();
-//
-//
-//                 currentTreeNode.jsonPath = jsonPath + '.' + obj;
-//                 increaseNodeNumber();
-//                 allTreeNodes.push(cloneDeep(currentTreeNode));
-//                 walkJson(json_object[obj], obj, nodeId - 1, currentTreeNode.jsonPath);
-//             }
-//         }
-//         return allTreeNodes;
-//     }
-//
-//
-//     function walkJsonOld(json_object: any, parent: any, rootId: number, jsonPath: string) {
-//         for (const obj in json_object) {
-//             if (typeof json_object[obj] === 'string') {
-//                 //console.log(`leaf ${obj} = ${json_object[obj]}`);
-//
-//                 // OBJECT IS A LEAF LEVEL OBJECT
-//                 currentTreeNode = {
-//                     isLinked: false,
-//                     idNumeric: 0,
-//                     id: '0',
-//                     name: '',
-//                     title: '',
-//                     type: 'string',
-//                     description: '',
-//                     required: '',
-//                     parentId: 0,
-//                     jsonPath,
-//                     children: []
-//                 };
-//                 createTreeObject(obj, json_object[obj], parent, rootId, jsonPath);
-//                 allTreeNodes.push(cloneDeep(currentTreeNode));
-//             } else if (typeof json_object[obj] === 'boolean') {
-//                 //console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! FOUND BOOLEAN', obj, json_object[obj], json_object);
-//
-//                 // OBJECT IS A LEAF LEVEL OBJECT
-//                 currentTreeNode = {
-//                     isLinked: false,
-//                     idNumeric: 0,
-//                     id: '0',
-//                     name: '',
-//                     title: '',
-//                     type: json_object[obj].toString(),
-//                     description: '',
-//                     required: '',
-//                     parentId: 0,
-//                     jsonPath,
-//                     children: []
-//                 };
-//                 createTreeObject(obj, json_object[obj], parent, rootId, jsonPath);
-//                 allTreeNodes.push(cloneDeep(currentTreeNode));
-//             } else {
-//                 // OBJECT HAS CHILDREN
-//                 currentTreeNode = {
-//                     isLinked: false,
-//                     idNumeric: 0,
-//                     id: '0',
-//                     name: '',
-//                     title: '',
-//                     type: Array.isArray(json_object[obj]) ? 'array' : 'composite',
-//                     description: '',
-//                     required: '',
-//                     parentId: 0,
-//                     jsonPath,
-//                     children: []
-//                 };
-//                 currentTreeNode.name = obj;
-//                 currentTreeNode.parentName = parent;
-//                 currentTreeNode.parentId = rootId;
-//                 currentTreeNode.idNumeric = nodeId;
-//                 currentTreeNode.id = nodeId.toString();
-//
-//
-//                 currentTreeNode.jsonPath = jsonPath + '.' + obj;
-//                 increaseNodeNumber();
-//                 allTreeNodes.push(cloneDeep(currentTreeNode));
-//                 walkJsonOld(json_object[obj], obj, nodeId - 1, currentTreeNode.jsonPath);
-//             }
-//         }
-//         return allTreeNodes;
-//     }
-//
-//     function mergeAttributesToParent(inputNodes: RenderTreeOld[] | undefined) {
-//         if (inputNodes) {
-//             let outputNodes = inputNodes.map((parent: RenderTreeOld) => {
-//                     if (parent.children) {
-//                         let i = parent.children.length;
-//                         while (i--) {
-//                             // @ts-ignore
-//                             if (parent.children[i] && parent.children[i].children.length > 0) {
-//                                 mergeAttributesToParent([parent.children[i]]);
-//                             }
-//                             if (parent.children[i].name === 'type') {
-//                                 parent.type = parent.children[i].title;
-//                                 //parent.children.splice(i, 1);
-//                             } else if (parent.children[i].name === 'description') {
-//                                 parent.description = parent.children[i].title;
-//                                 //parent.children.splice(i, 1);
-//                             } else if (parent.children[i].name === 'title') {
-//                                 parent.title = parent.children[i].title;
-//                                 //parent.children.splice(i, 1);
-//                             }
-//                         }
-//                     }
-//                     return parent;
-//                 }
-//             );
-//             return outputNodes;
-//         }
-//     }
-//
-//     // Unused
-//     function reverseTreeChildren(inputNodes: RenderTreeOld[] | undefined) {
-//         if (inputNodes) {
-//             for (let i = 0; i < inputNodes.length; i += 1) {
-//                 // @ts-ignore
-//                 if (inputNodes[i].children.length > 1) {
-//                     // @ts-ignore
-//                     inputNodes[i].children = inputNodes[i].children.reverse()
-//                     reverseTreeChildren(inputNodes[i].children);
-//                 }
-//             }
-//             return inputNodes;
-//         }
-//     }
-// }
-
+import { RenderTree } from '@app/common/interfaces/crosswalk-connection.interface';
 
 let treeIndex = 0;
 
 function createRenderTree(
   input: any,
-  elementPath: string,
+  rootPathIds: string[],
   definitions: any,
   idToNodeDictionary: { [key: string]: RenderTree[] },
 ) {
   const retArray: RenderTree[] = [];
   for (const obj in input) {
-    treeIndex += 1;
     const newNode: RenderTree = {
       name: definitions[obj].title,
       qname: definitions[obj]?.qname ? definitions[obj]?.qname : 'empty',
       visualTreeId: treeIndex.toString(),
       id: obj.toString(),
       properties: definitions[obj],
-      elementPath: elementPath + '.' + obj.toString(),
-      parentElementPath: elementPath,
+      rootPathIds: [...rootPathIds, obj.toString()],
       children: [],
       uri: definitions[obj]['@id'],
     };
@@ -234,48 +25,33 @@ function createRenderTree(
 
     //console.log('OBJ', obj, input[obj].keys, Object.keys(input[obj]));
     if (Object.keys(input[obj]).length > 0) {
-      // HAS CHILDREN
+      // HAS CHILDREN, OTHERWISE IS LEAF
       newNode.children = createRenderTree(
         input[obj],
-        newNode.elementPath,
+        newNode.rootPathIds,
         definitions,
         idToNodeDictionary,
       );
-    } else {
-      // IS LEAF
     }
     retArray.push(newNode);
+    treeIndex += 1;
   }
   return retArray;
 }
 
 export function generateTreeFromJson(jsonInput: any) {
+  // console.log('input-content-tree:', jsonInput.content.tree);
   const nodeIdToShallowNode: { [key: string]: RenderTree[] } = {};
-  const treeRoot: RenderTree = {
-    name: 'ROOT',
-    qname: 'ROOT',
-    visualTreeId: '0',
-    id: 'ROOT',
-    properties: undefined,
-    uri: '',
-    elementPath: 'ROOT',
-    parentElementPath: undefined,
-    children: [],
-  };
-  nodeIdToShallowNode['ROOT'] = [treeRoot];
 
   const generatedTree = new Promise<RenderTree[]>((resolve) => {
     const renderedTree = createRenderTree(
       jsonInput.content.tree,
-      'ROOT',
+      [],
       jsonInput.content.definitions,
       nodeIdToShallowNode
     );
-    const retTree: RenderTree[] = [];
-    treeRoot.children = renderedTree;
-    retTree.push(treeRoot);
-    // console.log('renderedTree', renderedTree);
-    resolve(retTree);
+    // console.log('renderedTree ', renderedTree);
+    resolve(renderedTree);
     });
   return {generatedTree, nodeIdToShallowNode};
 }
diff --git a/mscr-ui/src/common/components/schema/schema.slice.tsx b/mscr-ui/src/common/components/schema/schema.slice.tsx
index fb1009770..f1b259ad7 100644
--- a/mscr-ui/src/common/components/schema/schema.slice.tsx
+++ b/mscr-ui/src/common/components/schema/schema.slice.tsx
@@ -64,6 +64,14 @@ export const schemaApi = createApi({
         },
       })
     }),
+    // this should be the API for creating revisions of schemas in MSCR format
+    putMscrSchemaRevision: builder.mutation<Schema, { pid: string; data: Partial<Metadata> }>({
+      query: ({pid, data }) => ({
+        url: `/schema?action=revisionOf&target=${pid}`,
+        method: 'PUT',
+        data: data,
+      })
+    }),
     putSchemaMscrCopy: builder.mutation<Schema, { pid: string; data: Partial<Metadata> }>({
       query: ({pid, data }) => ({
         url: `/schema?action=mscrCopyOf&target=${pid}`,
@@ -182,6 +190,7 @@ export const {
   useGetSchemasQuery,
   usePutSchemaFullMutation,
   usePutSchemaRevisionMutation,
+  usePutMscrSchemaRevisionMutation,
   usePutSchemaMscrCopyMutation,
   usePatchSchemaMutation,
   usePatchSchemaRootSelectionMutation,
diff --git a/mscr-ui/src/common/interfaces/crosswalk-connection.interface.ts b/mscr-ui/src/common/interfaces/crosswalk-connection.interface.ts
index a1fc9cf80..fe970b788 100644
--- a/mscr-ui/src/common/interfaces/crosswalk-connection.interface.ts
+++ b/mscr-ui/src/common/interfaces/crosswalk-connection.interface.ts
@@ -36,8 +36,7 @@ export interface RenderTree {
     visualTreeId: string;
     id: string;
     properties: any;
-    elementPath: string;
-    parentElementPath: string | undefined;
+    rootPathIds: string[];
     children: RenderTree[];
     uri: string;
 }
diff --git a/mscr-ui/src/common/utils/has-permission.tsx b/mscr-ui/src/common/utils/has-permission.tsx
index 95dc631ef..aa226bb1c 100644
--- a/mscr-ui/src/common/utils/has-permission.tsx
+++ b/mscr-ui/src/common/utils/has-permission.tsx
@@ -11,16 +11,15 @@ import { Roles } from '../interfaces/format.interface';
 
 // Need to specify the actions permitted for each type of user
 const actions = [
-  // 'CREATE_SCHEMA',
   // 'EDIT_SCHEMA',
   // 'EDIT_SCHEMA_METADATA',
   // 'EDIT_SCHEMA_FILES',
   // 'DELETE_SCHEMA',
-  // 'CREATE_CROSSWALK',
   // 'EDIT_CROSSWALK_MAPPINGS',
   // 'EDIT_CROSSWALK_METADATA',
   // 'EDIT_CROSSWALK_FILES',
   // 'DELETE_CROSSWALK',
+  'CREATE_CONTENT',
   'EDIT_CONTENT',
   'MAKE_MSCR_COPY',
 ] as const;
@@ -77,7 +76,11 @@ export default function HasPermission({ action, owner }: hasPermissionProps) {
 }
 
 export function checkPermission({ user, action, owner }: checkPermissionProps) {
-  if (action == 'EDIT_CONTENT'||'MAKE_MSCR_COPY') {
+  //making MSCR Copy allowed for all
+  if (action == 'MAKE_MSCR_COPY') {
+    return true;
+  }
+  if (action == 'EDIT_CONTENT' || action == 'CREATE_CONTENT') {
     if (owner?.includes(user.id)) {
       //user is the owner, Check for personal Contents
       return true;
diff --git a/mscr-ui/src/modules/crosswalk-editor/index.tsx b/mscr-ui/src/modules/crosswalk-editor/index.tsx
index 28473589a..c8d8c3000 100644
--- a/mscr-ui/src/modules/crosswalk-editor/index.tsx
+++ b/mscr-ui/src/modules/crosswalk-editor/index.tsx
@@ -41,8 +41,7 @@ export default function CrosswalkEditor({
   const isEditModeActive = useSelector(selectIsEditContentActive());
 
   const emptyTreeSelection: RenderTree = {
-    elementPath: '',
-    parentElementPath: undefined,
+    rootPathIds: [],
     name: '',
     id: '',
     visualTreeId: '',
@@ -86,7 +85,10 @@ export default function CrosswalkEditor({
   const [isOneToManyMapping, setIsOneToManyMapping] = useState<boolean>(false);
   const [isPatchMappingOperation, setIsMappingPatchOperation] =
     useState<boolean>(false);
-  const [scrollToSelectedNodeId, setScrollToSelectedNodeId] = useState<
+  const [scrollToSelectedSourceNodeId, setScrollToSelectedSourceNodeId] = useState<
+    string | undefined
+  >('');
+  const [scrollToSelectedTargetNodeId, setScrollToSelectedTargetNodeId] = useState<
     string | undefined
   >('');
   const [mappingToBeEdited, setMappingToBeEdited] = useState<
@@ -395,6 +397,21 @@ export default function CrosswalkEditor({
     }
   };
 
+  function handleScrolling(mapping: NodeMapping, nodeId? : string) {
+    if (nodeId === undefined) {
+      setScrollToSelectedSourceNodeId(nodeId);
+      setScrollToSelectedTargetNodeId(nodeId);
+    } else {
+      if (nodeId === mapping.source[0].id) {
+        setScrollToSelectedSourceNodeId(nodeId);
+        setScrollToSelectedTargetNodeId(mapping.target[0].id);
+      } else {
+        setScrollToSelectedTargetNodeId(nodeId);
+        setScrollToSelectedSourceNodeId(mapping.source[0].id);
+      }
+    }
+  }
+
   const performCallbackFromAccordionAction = (
     mapping: NodeMapping,
     action: string,
@@ -402,22 +419,29 @@ export default function CrosswalkEditor({
     mappingOrHighlightOperationId?: string,
     isSourceTree?: boolean
   ) => {
-    setScrollToSelectedNodeId('');
+    setScrollToSelectedSourceNodeId('');
+    setScrollToSelectedTargetNodeId('');
     // TODO: implement add notes from accordion if needed?
     if (action === 'remove') {
       removeMapping(mapping);
     } else if (action === 'selectFromTreesByMapping') {
-      setScrollToSelectedNodeId(nodeId);
+      if (isSourceTree === true) {
+        setScrollToSelectedSourceNodeId(nodeId);
+        setScrollToSelectedTargetNodeId(mapping.target[0].id);
+      } else {
+        setScrollToSelectedTargetNodeId(nodeId);
+        setScrollToSelectedSourceNodeId(mapping.source[0].id);
+      }
       selectFromTreeByNodeMapping(mapping, true);
       selectFromTreeByNodeMapping(mapping, false);
     } else if (action === 'openMappingDetails') {
-      setScrollToSelectedNodeId(nodeId);
+      handleScrolling(mapping, nodeId);
       setIsMappingPatchOperation(true);
       setPatchPid(mapping.pid ? mapping.pid : '');
       selectFromTreeByNodeMapping(mapping, true);
       selectFromTreeByNodeMapping(mapping, false);
     } else if (action === 'highlightFunctionField') {
-      setScrollToSelectedNodeId(nodeId);
+      handleScrolling(mapping, nodeId);
       setHighlightOperation({
         operationId: mappingOrHighlightOperationId
           ? mappingOrHighlightOperationId
@@ -429,7 +453,7 @@ export default function CrosswalkEditor({
       selectFromTreeByNodeMapping(mapping, true);
       selectFromTreeByNodeMapping(mapping, false);
     } else if (action === 'removeMapping') {
-      setScrollToSelectedNodeId(nodeId);
+      handleScrolling(mapping, nodeId);
       removeMapping(mapping.pid);
     }
   };
@@ -495,7 +519,7 @@ export default function CrosswalkEditor({
               treeSelection={sourceTreeSelection}
               caption={t('crosswalk-editor.search-from-source-schema')}
               schemaUrn={sourceSchemaUrn}
-              scrollToSelectedNodeId={scrollToSelectedNodeId}
+              scrollToSelectedNodeId={scrollToSelectedSourceNodeId}
             />
           </div>
 
@@ -541,7 +565,7 @@ export default function CrosswalkEditor({
               treeSelection={targetTreeSelection}
               caption={t('crosswalk-editor.search-from-target-schema')}
               schemaUrn={targetSchemaUrn}
-              scrollToSelectedNodeId={scrollToSelectedNodeId}
+              scrollToSelectedNodeId={scrollToSelectedTargetNodeId}
             />
           </div>
         </div>
diff --git a/mscr-ui/src/modules/crosswalk-editor/mappings-accordion/index.tsx b/mscr-ui/src/modules/crosswalk-editor/mappings-accordion/index.tsx
index 358b3fd44..601d595da 100644
--- a/mscr-ui/src/modules/crosswalk-editor/mappings-accordion/index.tsx
+++ b/mscr-ui/src/modules/crosswalk-editor/mappings-accordion/index.tsx
@@ -360,7 +360,7 @@ function returnFullPath(id: string) : string {
 
 function returnPath(id: string, label: string, schemaFormat: Format | undefined, schemaData: SchemaWithContent | undefined) : string {
   let returnString = '';
-  if (schemaFormat === Format.Xsd || schemaFormat === Format.Csv || schemaFormat === Format.Jsonschema || schemaFormat === Format.Skosrdf
+  if (schemaFormat === Format.Xsd || schemaFormat === Format.Csv || schemaFormat === Format.Jsonschema
   || schemaFormat === Format.Enum || schemaFormat === Format.Mscr) {
     returnString = id.substring(id?.indexOf("#root-Root-") + "#root-Root-".length);
     let strings;
@@ -376,18 +376,11 @@ function returnPath(id: string, label: string, schemaFormat: Format | undefined,
       }
     }
     return returnString;
-  } else {
+
     let className = '';
-    if (schemaFormat === Format.Rdfs || schemaFormat === Format.Owl) {
-      if (id.lastIndexOf('#') === -1) {
-        returnString = id.substring(id.lastIndexOf('/') + 1);
-      } else {
-        className = id.substring(id?.lastIndexOf('/') + 1, label.lastIndexOf('#')) + ':';
-        let itemName = id.substring(id.lastIndexOf('#') + 1);
-        returnString = className + itemName;
-      }
     } else if (schemaFormat === Format.Shacl) {
       let definitions = schemaData?.content?.definitions;
+      let titleValue = undefined;
       if (definitions) {
         let keys = Object.keys(definitions);
         if (keys && keys.length > 0) {
@@ -402,7 +395,7 @@ function returnPath(id: string, label: string, schemaFormat: Format | undefined,
                   if (thirdLevelKeys[j] === id) {
                     for (let l = 0; l < secondLevelKeys.length; l += 1) {
                       if (secondLevelKeys[l] === 'title') {
-                        let titleValue = value[secondLevelKeys[l]];
+                        titleValue = value[secondLevelKeys[l]];
                         returnString = titleValue + ':' + label;
                       }
                     }
@@ -413,27 +406,41 @@ function returnPath(id: string, label: string, schemaFormat: Format | undefined,
           }
         }
       }
+      if (!titleValue && label && label.toLowerCase() === 'root') {
+        return label;
+      } else if (!titleValue && label && label.toLowerCase() !== 'root') {
+        return 'ROOT:' + label;
+      }
+      return returnString;
+    } else {
+      return label;
     }
-    return returnString;
-  }
 }
 function filterMappings(nodeMappingsInput: NodeMapping[], value: string, showAttributeNames: boolean) {
   let results: NodeMapping[] = [];
   const searchString = value.toLowerCase();
   nodeMappingsInput.forEach(item => {
-      if (item?.notes && item.notes.toLowerCase().includes(searchString)) {
+      let itemFound = false
+      if (item?.notes && item.notes.toLowerCase().includes(searchString) && !itemFound) {
         results.push(item);
+        itemFound = true;
+      }
+      if (!itemFound) {
+        item.source.forEach(src => {
+          if (src.label.toLowerCase().includes(searchString) && !itemFound) {
+            results.push(item);
+            itemFound = true;
+          }
+        });
+      }
+      if (!itemFound) {
+        item.target.forEach(src => {
+          if (src.label.toLowerCase().includes(searchString) && !itemFound) {
+            results.push(item);
+            itemFound = true;
+          }
+        });
       }
-      item.source.forEach(src => {
-        if (src.label.toLowerCase().includes(searchString)) {
-          results.push(item);
-        }
-      });
-      item.target.forEach(src => {
-        if (src.label.toLowerCase().includes(searchString)) {
-          results.push(item);
-        }
-      });
     }
   );
   return results;
diff --git a/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/index.tsx b/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/index.tsx
index f8e0a9e81..0a4b91f60 100644
--- a/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/index.tsx
+++ b/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/index.tsx
@@ -233,7 +233,7 @@ export default function NodeMappings(props: {
       if (action === 'moveNodeUp' && mappingNodes.length > 1) {
         let sourceNodesNew = [...mappingNodes];
         for (let i = 0; i < mappingNodes.length; i += 1) {
-          if (mappingNodes[i].source.id === mappingId) {
+          if ((isSourceNode && mappingNodes[i].source.id === mappingId) || (!isSourceNode && mappingNodes[i].target.id === mappingId)) {
             let first = mappingNodes[i - 1];
             let second = mappingNodes[i];
             sourceNodesNew[i - 1] = second;
@@ -244,7 +244,7 @@ export default function NodeMappings(props: {
       } else if (action === 'moveNodeDown' && mappingNodes.length > 1) {
         let sourceNodesNew = [...mappingNodes];
         for (let i = 0; i < mappingNodes.length; i += 1) {
-          if (mappingNodes[i].source.id === mappingId) {
+          if ((isSourceNode && mappingNodes[i].source.id === mappingId) || (!isSourceNode && mappingNodes[i].target.id === mappingId)) {
             let first = mappingNodes[i];
             let second = mappingNodes[i + 1];
             sourceNodesNew[i] = second;
diff --git a/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/node-listing-accordion/index.tsx b/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/node-listing-accordion/index.tsx
index 0fd7a09af..4d446c9df 100644
--- a/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/node-listing-accordion/index.tsx
+++ b/mscr-ui/src/modules/crosswalk-editor/tabs/node-mappings/node-listing-accordion/index.tsx
@@ -207,7 +207,7 @@ function Row(props: {
           <div
             className={props.rowCount > 1 ? 'd-flex flex-column justify-content-center' : 'd-flex flex-column justify-content-center d-none'}>
             <div>
-              <Tooltip className={props.index !== 0 && props.isSourceAccordion ? '' : 'd-none'}
+              <Tooltip className={props.index !== 0 ? '' : 'd-none'}
                        title={'Order node up'}
                        placement="left"
               >
@@ -215,8 +215,8 @@ function Row(props: {
                   onClick={() => moveNode(true)}></StyledArrowCircleUp>
               </Tooltip>
             </div>
-            <div className={props.isSourceAccordion ? '' : 'ms-3'}>
-              {props.index !== props.rowCount - 1 && props.rowCount > 1 && props.isSourceAccordion &&
+            <div>
+              {props.index !== props.rowCount - 1 && props.rowCount > 1 &&
                   <Tooltip
                       title={'Order node down'}
                       placement="left"
@@ -338,11 +338,11 @@ export default function NodeListingAccordion(props: nodeListingAccordionProps) {
       // Source accordion
       if (props.isOneToManyMapping) {
         let newNode: NodeListingRow = {
-          description: props.nodes[0].source.properties.description,
-          processingSelection: props.nodes[0].sourceProcessing?.id,
-          processing: props.nodes[0].sourceProcessing,
-          type: props.nodes[0].source.properties.type,
-          isSelected: false, notes: undefined, name: props.nodes[0].source.name, id: props.nodes[0].source.id
+          description: props.nodes[0]?.source?.properties?.description,
+          processingSelection: props.nodes[0]?.sourceProcessing?.id,
+          processing: props.nodes[0]?.sourceProcessing,
+          type: props.nodes[0]?.source?.properties?.type,
+          isSelected: false, notes: undefined, name: props.nodes[0]?.source?.name, id: props.nodes[0]?.source?.id
         }
         newNodes.push(newNode);
       } else {
@@ -362,21 +362,21 @@ export default function NodeListingAccordion(props: nodeListingAccordionProps) {
       if (props.isOneToManyMapping) {
         props.nodes.forEach((node: CrosswalkConnectionNew) => {
           let newNode: NodeListingRow = {
-            description: node?.target.properties.description,
+            description: node?.target?.properties?.description,
             processingSelection: node?.targetProcessing?.id,
             processing: node?.targetProcessing,
-            type: node?.target.properties.type,
-            isSelected: false, notes: undefined, name: node.target.name, id: node.target.id
+            type: node?.target?.properties?.type,
+            isSelected: false, notes: undefined, name: node?.target?.name, id: node?.target?.id
           }
           newNodes.push(newNode);
         });
       } else {
         let newNode: NodeListingRow = {
-          description: props.nodes[0].target.properties.description,
-          processingSelection: props.nodes[0].targetProcessing?.id,
-          processing: props.nodes[0].targetProcessing,
-          type: props.nodes[0].target.properties.type,
-          isSelected: false, notes: undefined, name: props.nodes[0].target.name, id: props.nodes[0].target.id
+          description: props.nodes[0]?.target?.properties?.description,
+          processingSelection: props.nodes[0]?.targetProcessing?.id,
+          processing: props.nodes[0]?.targetProcessing,
+          type: props.nodes[0]?.target?.properties?.type,
+          isSelected: false, notes: undefined, name: props.nodes[0]?.target?.name, id: props.nodes[0]?.target?.id
         }
         newNodes.push(newNode);
       }
diff --git a/mscr-ui/src/modules/form/generate-payload.tsx b/mscr-ui/src/modules/form/generate-payload.tsx
index f2826199d..d6ce6d848 100644
--- a/mscr-ui/src/modules/form/generate-payload.tsx
+++ b/mscr-ui/src/modules/form/generate-payload.tsx
@@ -72,7 +72,7 @@ export default function generatePayload(
     }
   } else if (modalType == ModalType.RevisionMscr) {
     if (contentType == Type.Schema) {
-      const { namespace, organizations, format, ...revisionPayload } =
+      const { organizations, ...revisionPayload } =
         schemaPayload;
       return revisionPayload;
     } else if (contentType == Type.Crosswalk) {
diff --git a/mscr-ui/src/modules/form/index.tsx b/mscr-ui/src/modules/form/index.tsx
index c7dff51f6..2230e0d3e 100644
--- a/mscr-ui/src/modules/form/index.tsx
+++ b/mscr-ui/src/modules/form/index.tsx
@@ -18,6 +18,7 @@ import { useTranslation } from 'next-i18next';
 import getApiError from '@app/common/utils/getApiErrors';
 import { useRouter } from 'next/router';
 import {
+  usePutMscrSchemaRevisionMutation,
   usePutSchemaFullMutation,
   usePutSchemaMscrCopyMutation,
   usePutSchemaRevisionMutation,
@@ -100,6 +101,8 @@ export default function FormModal({
   const [putCrosswalkFull, resultCrosswalkFull] = usePutCrosswalkFullMutation();
   const [putSchemaRevision, resultSchemaRevision] =
     usePutSchemaRevisionMutation();
+  const [putMscrSchemaRevision, resultMscrSchemaRevision] =
+    usePutMscrSchemaRevisionMutation();
   const [putCrosswalkRevision, resultCrosswalkRevision] =
     usePutCrosswalkRevisionMutation();
   const [putCrosswalkFullRevision, resultCrosswalkFullRevision] =
@@ -108,10 +111,9 @@ export default function FormModal({
     usePutSchemaMscrCopyMutation();
   const [submitAnimationVisible, setSubmitAnimationVisible] =
     useState<boolean>(false);
-
   const formDataFromInitialData = useCallback(() => {
     if (!initialData) return;
-    const existingData: FormType = {
+  const existingData: FormType = {
       format:
         modalType == ModalType.MscrCopy ? Format.Mscr : initialData.format,
       languages: [
@@ -202,6 +204,12 @@ export default function FormModal({
             resultCrosswalkRevision.data
           ) {
             pid = resultCrosswalkRevision.data.pid;
+          } else if (
+            contentType == Type.Schema &&
+            resultMscrSchemaRevision.isSuccess &&
+            resultMscrSchemaRevision.data
+          ) {
+            pid = resultMscrSchemaRevision.data.pid;
           }
           break;
         case ModalType.RevisionFull:
@@ -247,6 +255,8 @@ export default function FormModal({
       resultSchemaMscrCopy.isSuccess,
       resultSchemaRevision.data,
       resultSchemaRevision.isSuccess,
+      resultMscrSchemaRevision.data,
+      resultMscrSchemaRevision.isSuccess,
     ]
   );
 
@@ -325,6 +335,7 @@ export default function FormModal({
       fileData,
       fileUri
     );
+
     setErrors(formErrors);
 
     if (
@@ -343,6 +354,7 @@ export default function FormModal({
         modalType,
         organizationPid
       );
+
       const newFormData = new FormData();
       newFormData.append('metadata', JSON.stringify(payload));
       if (fileUri && fileUri.length > 0) {
@@ -352,7 +364,6 @@ export default function FormModal({
       } else if (formData.format !== Format.Mscr) {
         return;
       }
-
       // Choose the api call and parameters according to content type and modal type
       let makeApiCall;
       if (modalType == ModalType.RegisterNewFull) {
@@ -364,6 +375,7 @@ export default function FormModal({
           }
         );
       } else if (modalType == ModalType.RegisterNewMscr) {
+        //what is register new MSCR?
         Promise.all([spinnerDelay(), putCrosswalk(payload)]).then((_values) => {
           setSubmitAnimationVisible(false);
         });
@@ -400,8 +412,20 @@ export default function FormModal({
         ]).then((_values) => {
           setSubmitAnimationVisible(false);
         });
+        // Creating revision of MSCR format schemas
+      } else if (
+        initialData &&
+        modalType == ModalType.RevisionMscr &&
+        contentType == Type.Schema
+      ) {
+        Promise.all([
+          spinnerDelay(),
+          putMscrSchemaRevision({ pid: initialData.pid, data: payload }),
+        ]).then((_values) => {
+          setSubmitAnimationVisible(false);
+        });
       }
-      // Missing scenarios: MSCR copy of a crosswalk, revision of an MSCR copy
+      // Missing scenarios: MSCR copy of a crosswalk
     }
   };
 
@@ -565,19 +589,19 @@ export default function FormModal({
             ? modalType == ModalType.RegisterNewFull
               ? t('content-form.title.schema-register')
               : modalType == ModalType.MscrCopy
-                ? t('content-form.title.schema-mscr-copy')
-                : t('content-form.title.schema-revision')
+              ? t('content-form.title.schema-mscr-copy')
+              : t('content-form.title.schema-revision')
             : modalType == ModalType.RegisterNewFull
-              ? t('content-form.title.crosswalk-register')
-              : modalType == ModalType.RegisterNewMscr
-                ? t('content-form.title.crosswalk-create')
-                : modalType == ModalType.MscrCopy
-                  ? t('content-form.title.crosswalk-mscr-copy')
-                  : t('content-form.title.crosswalk-revision')}
+            ? t('content-form.title.crosswalk-register')
+            : modalType == ModalType.RegisterNewMscr
+            ? t('content-form.title.crosswalk-create')
+            : modalType == ModalType.MscrCopy
+            ? t('content-form.title.crosswalk-mscr-copy')
+            : t('content-form.title.crosswalk-revision')}
         </ModalTitle>
 
         {(modalType == ModalType.RegisterNewFull ||
-            modalType == ModalType.RevisionFull) &&
+          modalType == ModalType.RevisionFull) &&
           renderFileDropArea()}
 
         {contentType == Type.Schema && (
@@ -628,15 +652,15 @@ export default function FormModal({
             ? modalType == ModalType.RegisterNewFull
               ? t('content-form.button.schema-register')
               : modalType == ModalType.MscrCopy
-                ? t('content-form.button.mscr-copy')
-                : t('content-form.button.schema-revision')
+              ? t('content-form.button.mscr-copy')
+              : t('content-form.button.schema-revision')
             : modalType == ModalType.RegisterNewFull
-              ? t('content-form.button.crosswalk-register')
-              : modalType == ModalType.RegisterNewMscr
-                ? t('content-form.button.crosswalk-create')
-                : modalType == ModalType.MscrCopy
-                  ? t('content-form.button.mscr-copy')
-                  : t('content-form.button.crosswalk-revision')}
+            ? t('content-form.button.crosswalk-register')
+            : modalType == ModalType.RegisterNewMscr
+            ? t('content-form.button.crosswalk-create')
+            : modalType == ModalType.MscrCopy
+            ? t('content-form.button.mscr-copy')
+            : t('content-form.button.crosswalk-revision')}
         </Button>
         <Button variant="secondary" onClick={() => handleClose()}>
           {userPosted ? t('close') : t('cancel')}
diff --git a/mscr-ui/src/modules/schema-view/index.tsx b/mscr-ui/src/modules/schema-view/index.tsx
index 576733e82..fb63b8697 100644
--- a/mscr-ui/src/modules/schema-view/index.tsx
+++ b/mscr-ui/src/modules/schema-view/index.tsx
@@ -69,7 +69,7 @@ export default function SchemaView({ schemaId }: { schemaId: string }) {
     isEditContentActive &&
     hasEditPermission &&
     schemaData?.format === Format.Mscr;
-  const hasCopyPermission = HasPermission({ action: 'MAKE_MSCR_COPY', owner: schemaData?.owner});
+  const hasCopyPermission = HasPermission({ action: 'MAKE_MSCR_COPY'});
   const router = useRouter(); // Force refresh the page
   const isMscrCopyAvailable =
     hasCopyPermission &&
@@ -351,16 +351,28 @@ export default function SchemaView({ schemaId }: { schemaId: string }) {
             text1={t('confirm-modal.unset-root-selection')}
           />
         )}
-        {/*ToDo: When making a revision of an mscr copy is possible, take that into account here (Modaltype.RevisionMscr)*/}
-        <FormModal
-          modalType={ModalType.RevisionFull}
-          contentType={Type.Schema}
-          visible={formModalIsOpen.version}
-          setVisible={(value) =>
-            dispatch(setFormModalState({ key: 'version', value: value }))
-          }
-          initialData={schemaData}
-        />
+        {schemaData.format == Format.Mscr ? (
+          <FormModal
+            modalType={ModalType.RevisionMscr}
+            contentType={Type.Schema}
+            visible={formModalIsOpen.version}
+            setVisible={(value) =>
+              dispatch(setFormModalState({ key: 'version', value: value }))
+            }
+            initialData={schemaData}
+          />
+        ) : (
+          <FormModal
+            modalType={ModalType.RevisionFull}
+            contentType={Type.Schema}
+            visible={formModalIsOpen.version}
+            setVisible={(value) =>
+              dispatch(setFormModalState({ key: 'version', value: value }))
+            }
+            initialData={schemaData}
+          />
+        )}
+
         <FormModal
           modalType={ModalType.MscrCopy}
           contentType={Type.Schema}
diff --git a/mscr-ui/src/modules/workspace/group-home/index.tsx b/mscr-ui/src/modules/workspace/group-home/index.tsx
index 1cbc0779d..64469182b 100644
--- a/mscr-ui/src/modules/workspace/group-home/index.tsx
+++ b/mscr-ui/src/modules/workspace/group-home/index.tsx
@@ -23,6 +23,7 @@ import FormModal, { ModalType } from '@app/modules/form';
 import Link from 'next/link';
 import { SpinnerWrapper } from '@app/modules/crosswalk-view/crosswalk-view.styles';
 import SpinnerOverlay from '@app/common/components/spinner-overlay';
+import HasPermission from '@app/common/utils/has-permission';
 
 interface GroupHomeProps {
   user: MscrUser;
@@ -34,6 +35,10 @@ export default function GroupWorkspace({
   pid,
   contentType,
 }: GroupHomeProps) {
+  const hasCreatePermission = HasPermission({
+    action: 'CREATE_CONTENT',
+    owner: [pid],
+  });
   const { t } = useTranslation('common');
   const router = useRouter();
   const lang = router.locale ?? '';
@@ -122,52 +127,54 @@ export default function GroupWorkspace({
             </TitleDescriptionWrapper>
           }
         />
-        <Separator isLarge />
-        <div>
-          <ButtonBlock>
-            {contentType == 'SCHEMA' ? (
-              <>
-                <ModalVisibilityButton
-                  setVisible={setRegisterSchemaModalVisible}
-                  label={t('content-form.button.schema-register')}
-                />
-                <FormModal
-                  modalType={ModalType.RegisterNewFull}
-                  contentType={Type.Schema}
-                  visible={registerSchemaModalVisible}
-                  setVisible={setRegisterSchemaModalVisible}
-                  organizationPid={pid}
-                />
-              </>
-            ) : (
-              <>
-                <ModalVisibilityButton
-                  setVisible={setRegisterCrosswalkModalVisible}
-                  label={t('content-form.button.crosswalk-register')}
-                />
-                <FormModal
-                  modalType={ModalType.RegisterNewFull}
-                  contentType={Type.Crosswalk}
-                  visible={registerCrosswalkModalVisible}
-                  setVisible={setRegisterCrosswalkModalVisible}
-                  organizationPid={pid}
-                />
-                <ModalVisibilityButton
-                  setVisible={setCreateCrosswalkModalVisible}
-                  label={t('content-form.button.crosswalk-create')}
-                />
-                <FormModal
-                  modalType={ModalType.RegisterNewMscr}
-                  contentType={Type.Crosswalk}
-                  visible={createCrosswalkModalVisible}
-                  setVisible={setCreateCrosswalkModalVisible}
-                  organizationPid={pid}
-                />
-              </>
-            )}
-          </ButtonBlock>
-        </div>
-        <Separator isLarge />
+        {hasCreatePermission &&
+          <div>
+            <Separator isLarge />
+            <ButtonBlock>
+              {contentType == 'SCHEMA' ? (
+                <>
+                  <ModalVisibilityButton
+                    setVisible={setRegisterSchemaModalVisible}
+                    label={t('content-form.button.schema-register')}
+                  />
+                  <FormModal
+                    modalType={ModalType.RegisterNewFull}
+                    contentType={Type.Schema}
+                    visible={registerSchemaModalVisible}
+                    setVisible={setRegisterSchemaModalVisible}
+                    organizationPid={pid}
+                  />
+                </>
+              ) : (
+                <>
+                  <ModalVisibilityButton
+                    setVisible={setRegisterCrosswalkModalVisible}
+                    label={t('content-form.button.crosswalk-register')}
+                  />
+                  <FormModal
+                    modalType={ModalType.RegisterNewFull}
+                    contentType={Type.Crosswalk}
+                    visible={registerCrosswalkModalVisible}
+                    setVisible={setRegisterCrosswalkModalVisible}
+                    organizationPid={pid}
+                  />
+                  <ModalVisibilityButton
+                    setVisible={setCreateCrosswalkModalVisible}
+                    label={t('content-form.button.crosswalk-create')}
+                  />
+                  <FormModal
+                    modalType={ModalType.RegisterNewMscr}
+                    contentType={Type.Crosswalk}
+                    visible={createCrosswalkModalVisible}
+                    setVisible={setCreateCrosswalkModalVisible}
+                    organizationPid={pid}
+                  />
+                </>
+              )}
+            </ButtonBlock>
+            <Separator isLarge />
+          </div>
+        }
         {data?.hits.hits && data?.hits.hits.length < 1 ? (
           <div>
             {contentType == 'SCHEMA'