diff --git a/src/editor/widgets/comment/Comment.jsx b/src/editor/widgets/comment/Comment.jsx
index 5a27b7c..263b614 100644
--- a/src/editor/widgets/comment/Comment.jsx
+++ b/src/editor/widgets/comment/Comment.jsx
@@ -27,12 +27,20 @@ const Comment = props => {
     props.onUpdate(props.body, { ...props.body, value: evt.target.value });
   }
 
+  const creatorInfo = props.body.creator && 
+    <div className="lastmodified">
+      <span className="lastmodified-by">{props.body.creator.name}</span>
+      { props.body.created && 
+        <span className="lastmodified-at">
+          <TimeAgo datetime={Environment.toClientTime(props.body.created)} />
+        </span> 
+      }
+    </div>
+
   return props.readOnly ? (
     <div className="r6o-widget comment">
       <div className="value">{props.body.value}</div>
-      <div className="lastmodified">
-        <div className="lastmodified-by">{props.body.creator?.name}</div>
-      </div>
+      { creatorInfo }
     </div>
   ) : (
     <div className={ isEditable ? "r6o-widget comment editable" : "r6o-widget comment"}>
@@ -43,16 +51,7 @@ const Comment = props => {
         onSaveAndClose={props.onSaveAndClose} 
       />
       
-      { props.body.creator && 
-        <div className="lastmodified">
-          <span className="lastmodified-by">{props.body.creator.name}</span>
-          { props.body.created && 
-            <span className="lastmodified-at">
-              <TimeAgo datetime={Environment.toClientTime(props.body.created)} />
-            </span> 
-          }
-        </div>
-      }
+      { creatorInfo }
 
       <div 
         className={isMenuVisible ? "icon arrow-down menu-open" : "icon arrow-down"} 
diff --git a/src/editor/widgets/tag/TagWidget.jsx b/src/editor/widgets/tag/TagWidget.jsx
index a13291d..2f679dd 100644
--- a/src/editor/widgets/tag/TagWidget.jsx
+++ b/src/editor/widgets/tag/TagWidget.jsx
@@ -35,23 +35,25 @@ const TagWidget = props => {
 
   return (
     <div className="tags">
-      <ul>
-        { tagBodies.map(tag => 
-          <li key={tag.value} onClick={toggle(tag.value)}>
-            <span className="label">{tag.value}</span>
+      { tagBodies.length > 0 &&
+        <ul>
+          { tagBodies.map(tag => 
+            <li key={tag.value} onClick={toggle(tag.value)}>
+              <span className="label">{tag.value}</span>
 
-            {!props.readOnly &&
-              <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>
-            }
-          </li>
-        )}
-      </ul>
+                </CSSTransition>
+              }
+            </li>
+          )}
+        </ul>
+      }
 
       { !props.readOnly &&
         <input 
diff --git a/themes/default/editor/_editor.scss b/themes/default/editor/_editor.scss
index 0ff253a..b906ae1 100644
--- a/themes/default/editor/_editor.scss
+++ b/themes/default/editor/_editor.scss
@@ -49,7 +49,7 @@
     }
 
     .r6o-widget {
-      border-bottom:1px solid $lightgrey-border-darker;
+      border-bottom:1px solid $lightgrey-border;
     }
   }
 
diff --git a/themes/default/editor/widgets/tag/_tag.scss b/themes/default/editor/widgets/tag/_tag.scss
index efa4b2a..d569360 100644
--- a/themes/default/editor/widgets/tag/_tag.scss
+++ b/themes/default/editor/widgets/tag/_tag.scss
@@ -1,3 +1,7 @@
+.tags:empty {
+  display:none;
+}
+
 .tags {
   background-color:$blueish-white;
   border-bottom:1px solid $lightgrey-border;