diff --git a/editors/demo/src/Editors.js b/editors/demo/src/Editors.js
index 166168897656c1d73e46585d9f7a08e372190219..1e839e3d33a7e73e494ec5a4903e8c7fa669e16d 100644
--- a/editors/demo/src/Editors.js
+++ b/editors/demo/src/Editors.js
@@ -70,7 +70,7 @@ const Editors = () => {
       case 'ncbi':
         return <NCBI />;
       default:
-        return <Editoria />;
+        return <HHMI />;
     }
   };
 
diff --git a/editors/demo/src/HHMI/config/config.js b/editors/demo/src/HHMI/config/config.js
index b96e5e31f28699afb71d877ae9ba7d4a686b740a..10d4f3fc6b29181950ec59585cd48abd08390747 100644
--- a/editors/demo/src/HHMI/config/config.js
+++ b/editors/demo/src/HHMI/config/config.js
@@ -75,7 +75,7 @@ export default {
   PmPlugins: [columnResizing(), tableEditing(), invisibles([hardBreak()])],
 
   services: [
-    new EnterService(),
+    // new EnterService(),
     new MatchingService(),
     new MatchingToolGroupService(),
     new FillTheGapQuestionService(),
diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
index 2099fe9a652ec189c378f5649db4b6a2f0293827..d8fbb4c769b0c0ead57f70e932ba1c08236872ce 100644
--- a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
+++ b/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js
@@ -1,6 +1,7 @@
 /* eslint-disable react/prop-types */
 import React, { useContext } from 'react';
 import { WaxContext } from 'wax-prosemirror-core';
+import { Icon } from 'wax-prosemirror-components';
 import styled from 'styled-components';
 import FeedbackComponent from './FeedbackComponent';
 
@@ -10,10 +11,38 @@ const MatchingContainer = styled.div`
 `;
 
 const MatchingWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
   margin-bottom: ;
   margin: 0px 38px 15px 38px;
+  margin-top: 10px;
+`;
 
+const QuestionWrapper = styled.div`
+  display: flex;
+  flex-direction: row;
+`;
+const LeftArea = styled.div`
+  display: flex;
+`;
+const RightArea = styled.div`
+  display: flex;
+`;
+const CreateOptions = styled.div`
+  display: flex;
   margin-top: 10px;
+  border: 1px solid black;
+`;
+
+const ActionButton = styled.button`
+  border: none;
+  background: transparent;
+  cursor: pointer;
+`;
+
+const StyledIconAction = styled(Icon)`
+  height: 24px;
+  width: 24px;
 `;
 
 export default ({ node, view, getPos }) => {
@@ -30,10 +59,33 @@ export default ({ node, view, getPos }) => {
 
   const readOnly = !isEditable;
 
+  const addOption = () => {};
+
   return (
     <MatchingWrapper>
       <span>Matching</span>
       <MatchingContainer className="matching">
+        <QuestionWrapper>
+          <LeftArea>
+            <input type="text"></input>
+            {!readOnly && (
+              <ActionButton
+                onClick={() => addOption(node.attrs.id)}
+                type="button"
+              >
+                <StyledIconAction name="plusSquare" />
+              </ActionButton>
+            )}
+          </LeftArea>
+          <RightArea>Right</RightArea>
+        </QuestionWrapper>
+        <QuestionWrapper>
+          <LeftArea>
+            <input type="text"></input>
+          </LeftArea>
+          <RightArea>Right</RightArea>
+        </QuestionWrapper>
+        <CreateOptions>Options</CreateOptions>
         {!(readOnly && !customProps.showFeedBack) && (
           <FeedbackComponent
             getPos={getPos}