diff --git a/src/editor/Editor.jsx b/src/editor/Editor.jsx
index 22b70f5..0f8923d 100644
--- a/src/editor/Editor.jsx
+++ b/src/editor/Editor.jsx
@@ -82,6 +82,8 @@ const Editor = props => {
     }
   };  
 
+  console.log(props);
+
   return (
     <div ref={element} className="r6o-editor">
       <div className="arrow" />
@@ -89,6 +91,7 @@ const Editor = props => {
         {React.Children.map(props.children, child =>
           React.cloneElement(child, { 
             annotation : currentAnnotation,
+            readOnly : props.readOnly,
             onAppendBody : onAppendBody,
             onUpdateBody : onUpdateBody,
             onRemoveBody : onRemoveBody,
diff --git a/src/editor/widgets/tag/TagWidget.jsx b/src/editor/widgets/tag/TagWidget.jsx
index 7343ce2..3b8ad46 100644
--- a/src/editor/widgets/tag/TagWidget.jsx
+++ b/src/editor/widgets/tag/TagWidget.jsx
@@ -38,23 +38,27 @@ const TagWidget = props => {
           <li key={tag.value} onClick={toggle(tag.value)}>
             <span className="label">{tag.value}</span>
 
-            <CSSTransition in={showDelete === tag.value} timeout={200} classNames="delete">
-              <span className="delete-wrapper" onClick={onDelete(tag)}>
-                <span className="delete">
-                  <CloseIcon width={12} />
+            {!props.readOnly &&
+              <CSSTransition in={showDelete === tag.value} timeout={200} classNames="delete">
+                <span className="delete-wrapper" onClick={onDelete(tag)}>
+                  <span className="delete">
+                    <CloseIcon width={12} />
+                  </span>
                 </span>
-              </span>
-            </CSSTransition>
+              </CSSTransition>
+            }
           </li>
         )}
       </ul>
 
-      <input 
-        type="text" 
-        value={newTag} 
-        onChange={evt => setNewTag(evt.target.value)} 
-        onKeyDown={onKeyDown}
-        placeholder="Add tag..." />
+      { !props.readOnly &&
+        <input 
+          type="text" 
+          value={newTag} 
+          onChange={evt => setNewTag(evt.target.value)} 
+          onKeyDown={onKeyDown}
+          placeholder="Add tag..." />
+      }
     </div>
   )
 
diff --git a/themes/default/editor/widgets/_textentry.scss b/themes/default/editor/widgets/_textentry.scss
index d72c46f..5b62e0b 100644
--- a/themes/default/editor/widgets/_textentry.scss
+++ b/themes/default/editor/widgets/_textentry.scss
@@ -1,5 +1,4 @@
 .r6o-editable-text {
-  padding:8px 10px;
   max-height:120px;
   overflow:auto;
   outline:none;
diff --git a/themes/default/editor/widgets/comment/_comment.scss b/themes/default/editor/widgets/comment/_comment.scss
index 1b1fd9f..d069668 100644
--- a/themes/default/editor/widgets/comment/_comment.scss
+++ b/themes/default/editor/widgets/comment/_comment.scss
@@ -3,6 +3,7 @@
   min-height:3em;
   background-color:#fff;
   position:relative;
+  padding:8px 10px;
 
   .arrow-down {
     position:absolute;