diff --git a/.eslintignore b/.eslintignore
index cd0c80673..6fecd9d9b 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -10,4 +10,5 @@ plugins/*
 !plugins/coral-plugin-like
 !plugins/coral-plugin-mod
 !plugins/coral-plugin-love
+!plugins/coral-plugin-viewing-options
 node_modules
diff --git a/client/coral-embed-stream/src/components/Comment.css b/client/coral-embed-stream/src/components/Comment.css
index 5fab57d95..e0b21a34d 100644
--- a/client/coral-embed-stream/src/components/Comment.css
+++ b/client/coral-embed-stream/src/components/Comment.css
@@ -97,3 +97,7 @@
 .Wizard .textAlignRight {
   text-align: right;
 }
+
+.commentInfoBar {
+ float: right;
+}
diff --git a/client/coral-embed-stream/src/components/Comment.js b/client/coral-embed-stream/src/components/Comment.js
index 2a434c3d7..9d0c9627f 100644
--- a/client/coral-embed-stream/src/components/Comment.js
+++ b/client/coral-embed-stream/src/components/Comment.js
@@ -282,6 +282,7 @@ export default class Comment extends React.Component {
           </span>
 
           <Slot
+            className={styles.commentInfoBar}
             fill="commentInfoBar"
             depth={depth}
             comment={comment}
@@ -289,7 +290,6 @@ export default class Comment extends React.Component {
             data={this.props.data}
             root={this.props.root}
             inline
-            right
           />
 
           { (currentUser &&
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 1b4ac500b..49ef6c620 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -141,7 +141,7 @@ const extension = {
             parent_id,
             asset_id,
             action_summaries: [],
-            tags,
+            tags: tags.map((t) => ({name: t, __typename: 'Tag'})),
             status: null,
             replyCount: 0,
             replies: {
diff --git a/client/coral-embed-stream/style/default.css b/client/coral-embed-stream/style/default.css
index a8b7f9c61..0017b87d3 100644
--- a/client/coral-embed-stream/style/default.css
+++ b/client/coral-embed-stream/style/default.css
@@ -493,8 +493,4 @@ button.comment__action-button[disabled],
   .commentActionsLeft.comment__action-container .coral-plugin-replies-reply-button .coral-plugin-replies-icon {
     visibility: visible;
   }
-}
-
-.offTopicComment {
-  display: none;
-}
+}
\ No newline at end of file
diff --git a/client/coral-framework/components/Slot.css b/client/coral-framework/components/Slot.css
index 91569b717..6a95d79ad 100644
--- a/client/coral-framework/components/Slot.css
+++ b/client/coral-framework/components/Slot.css
@@ -2,10 +2,6 @@
   display: inline-block;
 }
 
-.right {
-  float: right;
-}
-
 .debug {
   background-color: coral;
 }
\ No newline at end of file
diff --git a/client/coral-framework/components/Slot.js b/client/coral-framework/components/Slot.js
index 342532bdb..22a315623 100644
--- a/client/coral-framework/components/Slot.js
+++ b/client/coral-framework/components/Slot.js
@@ -4,9 +4,9 @@ import styles from './Slot.css';
 import {connect} from 'react-redux';
 import {getSlotElements} from 'coral-framework/helpers/plugins';
 
-function Slot ({fill, inline = false, right = false, plugin_config: config, ...rest}) {
+function Slot ({fill, inline = false, className, plugin_config: config, ...rest}) {
   return (
-    <div className={cn({[styles.inline]: inline, [styles.right]: right, [styles.debug]: config.debug})}>
+    <div className={cn({[styles.inline]: inline, [styles.debug]: config.debug}, className)}>
       {getSlotElements(fill, {...rest, config})}
     </div>
   );
diff --git a/plugins/coral-plugin-offtopic/client/components/styles.css b/plugins/coral-plugin-offtopic/client/components/styles.css
index cf26c9199..e0c9d5cfe 100644
--- a/plugins/coral-plugin-offtopic/client/components/styles.css
+++ b/plugins/coral-plugin-offtopic/client/components/styles.css
@@ -22,4 +22,6 @@
   padding: 5px 0;
 }
 
-
+:global(.offTopicComment) {
+  display: none;
+}
diff --git a/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js b/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js
index 0a251fd13..f76006c4e 100644
--- a/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js
+++ b/plugins/coral-plugin-viewing-options/client/components/ViewingOptions.js
@@ -39,4 +39,4 @@ const ViewingOptions = (props) => {
   );
 };
 
-export default ViewingOptions;
\ No newline at end of file
+export default ViewingOptions;
diff --git a/plugins/coral-plugin-viewing-options/client/constants.js b/plugins/coral-plugin-viewing-options/client/constants.js
index 50fe4023d..7ff2dea6f 100644
--- a/plugins/coral-plugin-viewing-options/client/constants.js
+++ b/plugins/coral-plugin-viewing-options/client/constants.js
@@ -1,2 +1,2 @@
 export const OPEN_VIEWING_OPTIONS = 'OPEN_VIEWING_OPTIONS';
-export const CLOSE_VIEWING_OPTIONS = 'CLOSE_VIEWING_OPTIONS';
\ No newline at end of file
+export const CLOSE_VIEWING_OPTIONS = 'CLOSE_VIEWING_OPTIONS';
diff --git a/plugins/coral-plugin-viewing-options/client/reducer.js b/plugins/coral-plugin-viewing-options/client/reducer.js
index 8c81e3109..fc1278f38 100644
--- a/plugins/coral-plugin-viewing-options/client/reducer.js
+++ b/plugins/coral-plugin-viewing-options/client/reducer.js
@@ -6,15 +6,15 @@ const initialState = {
 
 export default function offTopic (state = initialState, action) {
   switch (action.type) {
-    case OPEN_VIEWING_OPTIONS:
-      return {
-        ...state,
-        open: true
-      };
-    case CLOSE_VIEWING_OPTIONS:
-      return {
-        ...state,
-        open: false
+  case OPEN_VIEWING_OPTIONS:
+    return {
+      ...state,
+      open: true
+    };
+  case CLOSE_VIEWING_OPTIONS:
+    return {
+      ...state,
+      open: false
     };
   default :
     return state;
diff --git a/plugins/coral-plugin-viewing-options/index.js b/plugins/coral-plugin-viewing-options/index.js
index a09954537..f053ebf79 100644
--- a/plugins/coral-plugin-viewing-options/index.js
+++ b/plugins/coral-plugin-viewing-options/index.js
@@ -1 +1 @@
-module.exports = {};
\ No newline at end of file
+module.exports = {};