diff --git a/plugins/talk-plugin-sort-most-liked/client/index.js b/plugins/talk-plugin-sort-most-liked/client/index.js
index eb49045af..ef7892403 100644
--- a/plugins/talk-plugin-sort-most-liked/client/index.js
+++ b/plugins/talk-plugin-sort-most-liked/client/index.js
@@ -1,5 +1,5 @@
 import translations from './translations.yml';
-import { createSortOption } from 'plugin-api/beta/client/factories';
+import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories';
 import { t } from 'plugin-api/beta/client/services';
 
 const SortOption = createSortOption(
diff --git a/plugins/talk-plugin-sort-most-loved/client/index.js b/plugins/talk-plugin-sort-most-loved/client/index.js
index 371ff4deb..a2a70e354 100644
--- a/plugins/talk-plugin-sort-most-loved/client/index.js
+++ b/plugins/talk-plugin-sort-most-loved/client/index.js
@@ -1,5 +1,5 @@
 import translations from './translations.yml';
-import { createSortOption } from 'plugin-api/beta/client/factories';
+import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories';
 import { t } from 'plugin-api/beta/client/services';
 
 const SortOption = createSortOption(
diff --git a/plugins/talk-plugin-sort-most-replied/client/index.js b/plugins/talk-plugin-sort-most-replied/client/index.js
index 5bd61eb5e..77d66a0e0 100644
--- a/plugins/talk-plugin-sort-most-replied/client/index.js
+++ b/plugins/talk-plugin-sort-most-replied/client/index.js
@@ -1,5 +1,5 @@
 import translations from './translations.yml';
-import { createSortOption } from 'plugin-api/beta/client/factories';
+import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories';
 import { t } from 'plugin-api/beta/client/services';
 
 const SortOption = createSortOption(
diff --git a/plugins/talk-plugin-sort-most-respected/client/index.js b/plugins/talk-plugin-sort-most-respected/client/index.js
index 21f726ede..7d72ef5ae 100644
--- a/plugins/talk-plugin-sort-most-respected/client/index.js
+++ b/plugins/talk-plugin-sort-most-respected/client/index.js
@@ -1,5 +1,5 @@
 import translations from './translations.yml';
-import { createSortOption } from 'plugin-api/beta/client/factories';
+import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories';
 import { t } from 'plugin-api/beta/client/services';
 
 const SortOption = createSortOption(
diff --git a/plugins/talk-plugin-sort-newest/client/index.js b/plugins/talk-plugin-sort-newest/client/index.js
index e49ef4f7e..ff58833b7 100644
--- a/plugins/talk-plugin-sort-newest/client/index.js
+++ b/plugins/talk-plugin-sort-newest/client/index.js
@@ -1,5 +1,5 @@
 import translations from './translations.yml';
-import { createSortOption } from 'plugin-api/beta/client/factories';
+import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories';
 import { t } from 'plugin-api/beta/client/services';
 
 const SortOption = createSortOption(() => t('talk-plugin-sort-newest.label'), {
diff --git a/plugins/talk-plugin-sort-oldest/client/index.js b/plugins/talk-plugin-sort-oldest/client/index.js
index 5e010e2c4..f7d072388 100644
--- a/plugins/talk-plugin-sort-oldest/client/index.js
+++ b/plugins/talk-plugin-sort-oldest/client/index.js
@@ -1,5 +1,5 @@
 import translations from './translations.yml';
-import { createSortOption } from 'plugin-api/beta/client/factories';
+import { createSortOption } from 'talk-plugin-viewing-options/client/api/factories';
 import { t } from 'plugin-api/beta/client/services';
 
 const SortOption = createSortOption(() => t('talk-plugin-sort-oldest.label'), {
diff --git a/plugin-api/beta/client/components/SortOption.css b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.css
similarity index 100%
rename from plugin-api/beta/client/components/SortOption.css
rename to plugins/talk-plugin-viewing-options/client/api/components/SortOption.css
diff --git a/plugin-api/beta/client/components/SortOption.js b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js
similarity index 72%
rename from plugin-api/beta/client/components/SortOption.js
rename to plugins/talk-plugin-viewing-options/client/api/components/SortOption.js
index 8ed0dd149..f8bd7e6fb 100644
--- a/plugin-api/beta/client/components/SortOption.js
+++ b/plugins/talk-plugin-viewing-options/client/api/components/SortOption.js
@@ -1,11 +1,18 @@
 import React from 'react';
+import cn from 'classnames';
 import styles from './SortOption.css';
 import PropTypes from 'prop-types';
+import { PLUGIN_NAME } from '../../constants';
 
 export default class SortOption extends React.Component {
   render() {
+    const className = cn([
+      styles.label,
+      `${PLUGIN_NAME}-sort-option`,
+      { [`${PLUGIN_NAME}-sort-option-active`]: this.props.active },
+    ]);
     return (
-      <label className={styles.label}>
+      <label className={className}>
         <input
           type="radio"
           onChange={this.props.setSort}
diff --git a/plugin-api/beta/client/factories/index.js b/plugins/talk-plugin-viewing-options/client/api/factories/index.js
similarity index 85%
rename from plugin-api/beta/client/factories/index.js
rename to plugins/talk-plugin-viewing-options/client/api/factories/index.js
index 364537cd5..0d3fdb5b9 100644
--- a/plugin-api/beta/client/factories/index.js
+++ b/plugins/talk-plugin-viewing-options/client/api/factories/index.js
@@ -1,4 +1,4 @@
-import withSortOption from '../hocs/withSortOption';
+import withSortOption from 'plugin-api/beta/client/hocs/withSortOption';
 import SortOption from '../components/SortOption';
 
 /**
diff --git a/plugins/talk-plugin-viewing-options/client/constants.js b/plugins/talk-plugin-viewing-options/client/constants.js
index c1b6a8216..cc45c20e1 100644
--- a/plugins/talk-plugin-viewing-options/client/constants.js
+++ b/plugins/talk-plugin-viewing-options/client/constants.js
@@ -1,4 +1,6 @@
-const prefix = 'TALK_VIEWING_OPTIONS';
+export const PLUGIN_NAME = 'talk-plugin-viewing-options';
 
+/* Contants for redux actions */
+const prefix = 'TALK_VIEWING_OPTIONS';
 export const OPEN_MENU = `${prefix}_OPEN_MENU`;
 export const CLOSE_MENU = `${prefix}_CLOSE_MENU`;