diff --git a/src/render/idyll-display/components/author-tool-buttons.js b/src/render/idyll-display/components/author-tool-buttons.js
index 2f9cdb0..8c84472 100644
--- a/src/render/idyll-display/components/author-tool-buttons.js
+++ b/src/render/idyll-display/components/author-tool-buttons.js
@@ -74,7 +74,7 @@ class AuthorToolButtons extends React.PureComponent {
           )}
         </div>
         <div className='author-view-container' id={this.domId} onMouseEnter={() => this.setState({ isHovering: true })} onMouseLeave={() => this.setState({ isHovering: false })}>
-          <button
+          {idyllASTNode.name.toLowerCase() === 'graphic' ? null : <button
             className={`author-view-button`}
             onClick={this.handleClickProps.bind(this)}
             data-tip
@@ -90,7 +90,7 @@ class AuthorToolButtons extends React.PureComponent {
                 fill='white'
               />
             </svg>
-          </button>
+          </button>}
         </div>
       </div>
     );
diff --git a/src/render/idyll-display/components/drop-target.js b/src/render/idyll-display/components/drop-target.js
index b20ea4f..1e228af 100644
--- a/src/render/idyll-display/components/drop-target.js
+++ b/src/render/idyll-display/components/drop-target.js
@@ -71,7 +71,6 @@ const withDropListener = (callback) => {
       var tagInfo = this.context.propsMap.get(name.split('-').map(s => s.charAt(0).toUpperCase() + s.slice(1)).join('')) || { name: name };
       var tagName = (tagInfo ? (tagInfo.name || name) : name).split('-').map(s => s.charAt(0).toUpperCase() + s.slice(1)).join('')
 
-
       var tag = '[' + tagName + ' ';
       if (tagInfo.props !== undefined) {
         tagInfo.props
diff --git a/src/render/idyll-display/components/text-edit.js b/src/render/idyll-display/components/text-edit.js
index c9c0053..c68eea7 100644
--- a/src/render/idyll-display/components/text-edit.js
+++ b/src/render/idyll-display/components/text-edit.js
@@ -66,9 +66,10 @@ class TextEdit extends React.PureComponent {
   }
 
   getTag(name) {
-    var tagInfo = this.context.propsMap.get(name);
+    var tagInfo = this.context.propsMap.get(name.split('-').map(s => s.charAt(0).toUpperCase() + s.slice(1)).join('')) || { name: name };
+    var tagName = (tagInfo ? (tagInfo.name || name) : name).split('-').map(s => s.charAt(0).toUpperCase() + s.slice(1)).join('')
 
-    var tag = '[' + tagInfo.name + ' ';
+    var tag = '[' + tagName + ' ';
     if (tagInfo.props !== undefined) {
       tagInfo.props.filter(prop => prop.example !== undefined).forEach((prop) => {
         tag += prop.name + ':' + prop.example + ' ';
@@ -78,7 +79,7 @@ class TextEdit extends React.PureComponent {
       tag += ' /]';
     } else {
       var children = tagInfo.children !== undefined ? tagInfo.children[0] : '';
-      tag += ']' + children + '[/' + tagInfo.name + ']';
+      tag += ']' + children + '[/' + tagName + ']';
     }
 
     return tag;