diff --git a/src/editor/Editor.jsx b/src/editor/Editor.jsx
index dff25c4..11f8903 100644
--- a/src/editor/Editor.jsx
+++ b/src/editor/Editor.jsx
@@ -155,13 +155,13 @@ const Editor = props => {
         }
         
         { props.readOnly ? (
-          <div className="footer">
+          <div className="r6o-footer">
             <button
               className="r6o-btn" 
               onClick={onCancel}>{i18n.t('Close')}</button>
           </div>
         ) : (
-          <div className="footer">
+          <div className="r6o-footer">
             <button 
               className="r6o-btn outline"
               onClick={onCancel}>{i18n.t('Cancel')}</button>
diff --git a/src/editor/widgets/Autocomplete.js b/src/editor/widgets/Autocomplete.js
index 4e6aa79..fa279b9 100644
--- a/src/editor/widgets/Autocomplete.js
+++ b/src/editor/widgets/Autocomplete.js
@@ -7,8 +7,8 @@ const Autocomplete = props => {
 
   const [ inputItems, setInputItems ] = useState(props.vocabulary);
 
-  useEffect(() => 
-    element.current?.querySelector('input')?.focus(), []);
+  // useEffect(() => 
+  //   element.current?.querySelector('input')?.focus(), []);
   
   const onInputValueChange = ({ inputValue }) => {
     if (inputValue.length > 0) {
diff --git a/src/editor/widgets/comment/TextEntryField.jsx b/src/editor/widgets/comment/TextEntryField.jsx
index b386df5..f025063 100644
--- a/src/editor/widgets/comment/TextEntryField.jsx
+++ b/src/editor/widgets/comment/TextEntryField.jsx
@@ -19,8 +19,9 @@ export default class TextEntryField extends Component {
 
   // Focus on render
   onRender = ref => {
-    if (ref && this.props.editable)
+    if (ref && this.props.editable) {
       ref.focus();
+    }
   }
 
   render() {
diff --git a/themes/default/editor/_editor.scss b/themes/default/editor/_editor.scss
index 609462a..3126a63 100644
--- a/themes/default/editor/_editor.scss
+++ b/themes/default/editor/_editor.scss
@@ -54,7 +54,7 @@
     }
   }
 
-  .footer {
+  .r6o-footer {
     text-align:right;
     padding:8px 0;
 
diff --git a/themes/default/editor/widgets/comment/_comment.scss b/themes/default/editor/widgets/comment/_comment.scss
index a49928e..4db89d5 100644
--- a/themes/default/editor/widgets/comment/_comment.scss
+++ b/themes/default/editor/widgets/comment/_comment.scss
@@ -3,7 +3,10 @@
   min-height:3em;
   background-color:#fff;
   position:relative;
-  padding:8px 10px;
+
+  .r6o-editable-text {
+    padding:8px 10px;
+  }
 
   .lastmodified {
     border:1px solid $lightgrey-border;
diff --git a/themes/default/editor/widgets/tag/_tag.scss b/themes/default/editor/widgets/tag/_tag.scss
index 38ae70f..5ce2042 100644
--- a/themes/default/editor/widgets/tag/_tag.scss
+++ b/themes/default/editor/widgets/tag/_tag.scss
@@ -89,6 +89,7 @@
 
   .r6o-autocomplete {
     flex:1;
+    position:relative;
 
     li {
       font-size:14px;
@@ -96,6 +97,7 @@
   }
 
   input {
+    width:100%;
     padding:0 3px;
     min-width:80px;
     outline:none;