diff --git a/static/app-strings.json b/static/app-strings.json
index f00d1fbc4..b4cc13f9e 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -701,11 +701,7 @@
   "Bid position must be a number.": "Bid position must be a number.",
   "Copy": "Copy",
   "Copy Link": "Copy Link",
-  "Link copied.": "Link copied.",
-  "Failed to copy link.": "Failed to copy link.",
   "Copy RSS URL": "Copy RSS URL",
-  "RSS URL copied.": "RSS URL copied.",
-  "Failed to copy RSS URL.": "Failed to copy RSS URL.",
   "Text copied": "Text copied",
   "Rewards Disabled": "Rewards Disabled",
   "Wallet servers are used to relay data to and from the LBRY blockchain. They also determine what content shows in trending or is blocked. %learn_more%.": "Wallet servers are used to relay data to and from the LBRY blockchain. They also determine what content shows in trending or is blocked. %learn_more%.",
diff --git a/ui/component/channelContent/index.js b/ui/component/channelContent/index.js
index 8d3bbc6fb..5338a7218 100644
--- a/ui/component/channelContent/index.js
+++ b/ui/component/channelContent/index.js
@@ -14,7 +14,7 @@ import { withRouter } from 'react-router';
 import { selectUserVerifiedEmail } from 'redux/selectors/user';
 import { makeSelectClientSetting, selectShowMatureContent } from 'redux/selectors/settings';
 
-import ChannelContent from './view';
+import ChannelPage from './view';
 
 const select = (state, props) => {
   const { search } = props.location;
@@ -37,4 +37,4 @@ const perform = (dispatch) => ({
   doResolveUris: (uris, returnCachedUris) => dispatch(doResolveUris(uris, returnCachedUris)),
 });
 
-export default withRouter(connect(select, perform)(ChannelContent));
+export default withRouter(connect(select, perform)(ChannelPage));
diff --git a/ui/component/channelEdit/index.js b/ui/component/channelEdit/index.js
index 82618960f..3835fdf88 100644
--- a/ui/component/channelEdit/index.js
+++ b/ui/component/channelEdit/index.js
@@ -17,7 +17,7 @@ import {
 } from 'lbry-redux';
 import { doOpenModal } from 'redux/actions/app';
 import { doUpdateBlockListForPublishedChannel } from 'redux/actions/comments';
-import ChannelForm from './view';
+import ChannelPage from './view';
 
 const select = (state, props) => ({
   claim: makeSelectClaimForUri(props.uri)(state),
@@ -52,4 +52,4 @@ const perform = (dispatch) => ({
   clearChannelErrors: () => dispatch(doClearChannelErrors()),
 });
 
-export default connect(select, perform)(ChannelForm);
+export default connect(select, perform)(ChannelPage);
diff --git a/ui/component/channelMuteButton/view.jsx b/ui/component/channelMuteButton/view.jsx
index a87478d7e..2ffa6866b 100644
--- a/ui/component/channelMuteButton/view.jsx
+++ b/ui/component/channelMuteButton/view.jsx
@@ -10,7 +10,7 @@ type Props = {
   doChannelUnmute: (string, boolean) => void,
 };
 
-function ChannelMuteButton(props: Props) {
+function ChannelBlockButton(props: Props) {
   const { uri, doChannelMute, doChannelUnmute, isMuted } = props;
 
   function handleClick() {
@@ -22,8 +22,12 @@ function ChannelMuteButton(props: Props) {
   }
 
   return (
-    <Button button={isMuted ? 'alt' : 'secondary'} label={isMuted ? __('Unmute') : __('Mute')} onClick={handleClick} />
+    <Button
+      button={isMuted ? 'alt' : 'secondary'}
+      label={isMuted ? __('Unmute') : __('Mute')}
+      onClick={handleClick}
+    />
   );
 }
 
-export default ChannelMuteButton;
+export default ChannelBlockButton;
diff --git a/ui/component/channelSelector/index.js b/ui/component/channelSelector/index.js
index f56a21d63..0b353bb4d 100644
--- a/ui/component/channelSelector/index.js
+++ b/ui/component/channelSelector/index.js
@@ -2,9 +2,9 @@ import { connect } from 'react-redux';
 import { selectMyChannelClaims } from 'lbry-redux';
 import { selectActiveChannelClaim, selectIncognito } from 'redux/selectors/app';
 import { doSetActiveChannel, doSetIncognito } from 'redux/actions/app';
-import ChannelSelector from './view';
+import SelectChannel from './view';
 
-const select = (state) => ({
+const select = state => ({
   channels: selectMyChannelClaims(state),
   activeChannelClaim: selectActiveChannelClaim(state),
   incognito: selectIncognito(state),
@@ -13,4 +13,4 @@ const select = (state) => ({
 export default connect(select, {
   doSetActiveChannel,
   doSetIncognito,
-})(ChannelSelector);
+})(SelectChannel);
diff --git a/ui/component/claimCollectionAddButton/index.js b/ui/component/claimCollectionAddButton/index.js
index 191edf6aa..ec554737e 100644
--- a/ui/component/claimCollectionAddButton/index.js
+++ b/ui/component/claimCollectionAddButton/index.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
 import { doOpenModal } from 'redux/actions/app';
-import CollectionAddButton from './view';
+import PlaylistAddButton from './view';
 import { makeSelectClaimForUri } from 'lbry-redux';
 
 const select = (state, props) => ({
@@ -9,4 +9,4 @@ const select = (state, props) => ({
 
 export default connect(select, {
   doOpenModal,
-})(CollectionAddButton);
+})(PlaylistAddButton);
diff --git a/ui/component/claimMenuList/view.jsx b/ui/component/claimMenuList/view.jsx
index 822bd13f8..9463d8675 100644
--- a/ui/component/claimMenuList/view.jsx
+++ b/ui/component/claimMenuList/view.jsx
@@ -44,7 +44,7 @@ type Props = {
   collectionName?: string,
   collectionId: string,
   isMyCollection: boolean,
-  doToast: ({ message: string, isError?: boolean }) => void,
+  doToast: ({ message: string }) => void,
   claimIsMine: boolean,
   fileInfo: FileListItem,
   prepareEdit: ({}, string, {}) => void,
@@ -103,7 +103,7 @@ function ClaimMenuList(props: Props) {
   }
 
   const shareUrl: string = generateShareUrl(SHARE_DOMAIN, uri);
-  const rssUrl: string = isChannel ? generateRssUrl(URL, uri) : '';
+  const rssUrl: string = generateRssUrl(URL, uri);
   const isCollectionClaim = claim && claim.value_type === 'collection';
   // $FlowFixMe
   const isPlayable =
@@ -183,23 +183,12 @@ function ClaimMenuList(props: Props) {
     }
   }
 
-  function copyToClipboard(textToCopy, successMsg, failureMsg) {
-    navigator.clipboard
-      .writeText(textToCopy)
-      .then(() => {
-        doToast({ message: __(successMsg) });
-      })
-      .catch(() => {
-        doToast({ message: __(failureMsg), isError: true });
-      });
-  }
-
   function handleCopyRssLink() {
-    copyToClipboard(rssUrl, 'RSS URL copied.', 'Failed to copy RSS URL.');
+    navigator.clipboard.writeText(rssUrl);
   }
 
   function handleCopyLink() {
-    copyToClipboard(shareUrl, 'Link copied.', 'Failed to copy link.');
+    navigator.clipboard.writeText(shareUrl);
   }
 
   function handleReportContent() {
diff --git a/ui/component/claimTilesDiscover/view.jsx b/ui/component/claimTilesDiscover/view.jsx
index b38863a6f..7770e5ae4 100644
--- a/ui/component/claimTilesDiscover/view.jsx
+++ b/ui/component/claimTilesDiscover/view.jsx
@@ -115,7 +115,6 @@ type Props = {
   liveLivestreamsFirst?: boolean,
   livestreamMap?: { [string]: any },
   pin?: boolean,
-  showNoSourceClaims?: boolean,
 };
 
 function ClaimTilesDiscover(props: Props) {
@@ -148,7 +147,6 @@ function ClaimTilesDiscover(props: Props) {
     livestreamMap,
     // pin, // let's pin from /web folder
     prefixUris,
-    showNoSourceClaims,
   } = props;
 
   const { location } = useHistory();
@@ -292,11 +290,7 @@ function ClaimTilesDiscover(props: Props) {
         ? uris.map((uri, index) => (
             <ClaimPreviewTile key={uri} uri={uri} properties={renderProperties} live={resolveLive(index)} />
           ))
-        : new Array(pageSize)
-            .fill(1)
-            .map((x, i) => (
-              <ClaimPreviewTile showNoSourceClaims={hasNoSource || showNoSourceClaims} key={i} placeholder />
-            ))}
+        : new Array(pageSize).fill(1).map((x, i) => <ClaimPreviewTile key={i} placeholder />)}
     </ul>
   );
 }
diff --git a/ui/component/collectionEdit/index.js b/ui/component/collectionEdit/index.js
index aa673b1e6..1ff4e0d7c 100644
--- a/ui/component/collectionEdit/index.js
+++ b/ui/component/collectionEdit/index.js
@@ -19,7 +19,7 @@ import {
 } from 'lbry-redux';
 import { doOpenModal } from 'redux/actions/app';
 
-import CollectionForm from './view';
+import CollectionPage from './view';
 import { selectActiveChannelClaim, selectIncognito } from 'redux/selectors/app';
 
 const select = (state, props) => ({
@@ -50,4 +50,4 @@ const perform = (dispatch) => ({
   clearCollectionErrors: () => dispatch({ type: LBRY_REDUX_ACTIONS.CLEAR_COLLECTION_ERRORS }),
 });
 
-export default connect(select, perform)(CollectionForm);
+export default connect(select, perform)(CollectionPage);
diff --git a/ui/component/collectionMenuList/view.jsx b/ui/component/collectionMenuList/view.jsx
index e79a91fde..969c88b23 100644
--- a/ui/component/collectionMenuList/view.jsx
+++ b/ui/component/collectionMenuList/view.jsx
@@ -15,7 +15,7 @@ type Props = {
   collectionId: string,
 };
 
-function CollectionMenuList(props: Props) {
+function ClaimMenuList(props: Props) {
   const { inline = false, collectionId, collectionName, doOpenModal } = props;
 
   const { push } = useHistory();
@@ -65,4 +65,4 @@ function CollectionMenuList(props: Props) {
   );
 }
 
-export default CollectionMenuList;
+export default ClaimMenuList;
diff --git a/ui/component/collectionPreviewOverlay/view.jsx b/ui/component/collectionPreviewOverlay/view.jsx
index 01dd5ab8a..381cc6eb0 100644
--- a/ui/component/collectionPreviewOverlay/view.jsx
+++ b/ui/component/collectionPreviewOverlay/view.jsx
@@ -14,7 +14,7 @@ type Props = {
   collectionItemUrls: Array<string>,
 };
 
-function CollectionPreviewOverlay(props: Props) {
+function CollectionPreviewTileOverlay(props: Props) {
   const { collectionItemUrls } = props;
 
   if (collectionItemUrls && collectionItemUrls.length > 0) {
@@ -39,4 +39,4 @@ function CollectionPreviewOverlay(props: Props) {
   return null;
 }
 
-export default withRouter(CollectionPreviewOverlay);
+export default withRouter(CollectionPreviewTileOverlay);
diff --git a/ui/component/fileRender/view.jsx b/ui/component/fileRender/view.jsx
index 2a523e1f3..ec50e8007 100644
--- a/ui/component/fileRender/view.jsx
+++ b/ui/component/fileRender/view.jsx
@@ -97,13 +97,13 @@ class FileRender extends React.PureComponent<Props> {
       case RENDER_MODES.IMAGE:
         return (
           <React.Suspense fallback={null}>
-            <ImageViewer uri={uri} source={source} />
+            <ImageViewer uri={uri} source={source} />;
           </React.Suspense>
         );
       case RENDER_MODES.HTML:
         return (
           <React.Suspense fallback={null}>
-            <HtmlViewer source={downloadPath || source} />
+            <HtmlViewer source={downloadPath || source} />;
           </React.Suspense>
         );
       case RENDER_MODES.DOCUMENT:
@@ -127,7 +127,7 @@ class FileRender extends React.PureComponent<Props> {
       case RENDER_MODES.PDF:
         return (
           <React.Suspense fallback={null}>
-            <PdfViewer source={downloadPath || source} />
+            <PdfViewer source={downloadPath || source} />;
           </React.Suspense>
         );
       case RENDER_MODES.CAD:
@@ -155,7 +155,7 @@ class FileRender extends React.PureComponent<Props> {
       case RENDER_MODES.APPLICATION:
         return (
           <React.Suspense fallback={null}>
-            <AppViewer uri={uri} />
+            <AppViewer uri={uri} />;
           </React.Suspense>
         );
     }
diff --git a/ui/component/livestreamComment/view.jsx b/ui/component/livestreamComment/view.jsx
index 8bf9f71a3..67392d358 100644
--- a/ui/component/livestreamComment/view.jsx
+++ b/ui/component/livestreamComment/view.jsx
@@ -22,7 +22,7 @@ type Props = {
   supportAmount: number,
 };
 
-function LivestreamComment(props: Props) {
+function Comment(props: Props) {
   const { claim, uri, authorUri, message, commentIsMine, commentId, stakedLevel, supportAmount } = props;
   const [mouseIsHovering, setMouseHover] = React.useState(false);
   const commentByOwnerOfContent = claim && claim.signing_channel && claim.signing_channel.permanent_url === authorUri;
@@ -85,4 +85,4 @@ function LivestreamComment(props: Props) {
   );
 }
 
-export default LivestreamComment;
+export default Comment;
diff --git a/ui/component/livestreamComments/index.js b/ui/component/livestreamComments/index.js
index a90e75abe..071e9aa87 100644
--- a/ui/component/livestreamComments/index.js
+++ b/ui/component/livestreamComments/index.js
@@ -8,7 +8,7 @@ import {
   makeSelectSuperChatsForUri,
   makeSelectSuperChatTotalAmountForUri,
 } from 'redux/selectors/comments';
-import LivestreamComments from './view';
+import LivestreamFeed from './view';
 
 const select = (state, props) => ({
   claim: makeSelectClaimForUri(props.uri)(state),
@@ -24,4 +24,4 @@ export default connect(select, {
   doCommentSocketDisconnect,
   doCommentList,
   doSuperChatList,
-})(LivestreamComments);
+})(LivestreamFeed);
diff --git a/ui/component/livestreamList/index.js b/ui/component/livestreamList/index.js
index 3dffaca29..636241cf4 100644
--- a/ui/component/livestreamList/index.js
+++ b/ui/component/livestreamList/index.js
@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
-import LivestreamList from './view';
+import LivestreamCurrent from './view';
 
 const select = (state) => ({});
 
-export default connect(select)(LivestreamList);
+export default connect(select)(LivestreamCurrent);
diff --git a/ui/component/livestreamList/view.jsx b/ui/component/livestreamList/view.jsx
index 8bf033466..5a5c5646c 100644
--- a/ui/component/livestreamList/view.jsx
+++ b/ui/component/livestreamList/view.jsx
@@ -56,7 +56,6 @@ export default function LivestreamList() {
 
       {livestreamMap && Object.keys(livestreamMap).length > 0 && (
         <ClaimTilesDiscover
-          showNoSourceClaims
           hasNoSource
           streamTypes={null}
           channelIds={Object.keys(livestreamMap)}
diff --git a/ui/component/markdownLink/index.js b/ui/component/markdownLink/index.js
index 9eb0ce6c6..1b7315c6e 100644
--- a/ui/component/markdownLink/index.js
+++ b/ui/component/markdownLink/index.js
@@ -1,10 +1,10 @@
 import { connect } from 'react-redux';
 import { doOpenModal } from 'redux/actions/app';
-import MarkdownLink from './view';
+import ExternalLink from './view';
 
 const select = () => ({});
-const perform = (dispatch) => ({
+const perform = dispatch => ({
   openModal: (modal, props) => dispatch(doOpenModal(modal, props)),
 });
 
-export default connect(select, perform)(MarkdownLink);
+export default connect(select, perform)(ExternalLink);
diff --git a/ui/component/nagContinueFirstRun/index.js b/ui/component/nagContinueFirstRun/index.js
index 66f41ab2a..1d43e9fa1 100644
--- a/ui/component/nagContinueFirstRun/index.js
+++ b/ui/component/nagContinueFirstRun/index.js
@@ -1,11 +1,11 @@
 import { connect } from 'react-redux';
 import { SETTINGS } from 'lbry-redux';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
-import NagContinueFirstRun from './view';
+import UserSignIn from './view';
 
-const select = (state) => ({
+const select = state => ({
   followingAcknowledged: makeSelectClientSetting(SETTINGS.FOLLOWING_ACKNOWLEDGED)(state),
   firstRunStarted: makeSelectClientSetting(SETTINGS.FIRST_RUN_STARTED)(state),
 });
 
-export default connect(select)(NagContinueFirstRun);
+export default connect(select)(UserSignIn);
diff --git a/ui/component/notificationBubble/index.js b/ui/component/notificationBubble/index.js
index bc01d8fee..9bc30d408 100644
--- a/ui/component/notificationBubble/index.js
+++ b/ui/component/notificationBubble/index.js
@@ -1,11 +1,11 @@
 import { connect } from 'react-redux';
 import { selectUnseenNotificationCount } from 'redux/selectors/notifications';
 import { selectUser } from 'redux/selectors/user';
-import NotificationHeaderButton from './view';
+import NotificationBubble from './view';
 
 const select = (state) => ({
   unseenCount: selectUnseenNotificationCount(state),
   user: selectUser(state),
 });
 
-export default connect(select)(NotificationHeaderButton);
+export default connect(select)(NotificationBubble);
diff --git a/ui/component/notificationContentChannelMenu/index.js b/ui/component/notificationContentChannelMenu/index.js
index a877bd1c2..920acb797 100644
--- a/ui/component/notificationContentChannelMenu/index.js
+++ b/ui/component/notificationContentChannelMenu/index.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import { doChannelSubscribe } from 'redux/actions/subscriptions';
 import { doToast } from 'redux/actions/notifications';
 import { makeSelectNotificationsDisabled } from 'redux/selectors/subscriptions';
-import NotificationContentChannelMenu from './view';
+import SubscribeButton from './view';
 
 const select = (state, props) => ({
   notificationsDisabled: makeSelectNotificationsDisabled(props.uri)(state),
@@ -11,4 +11,4 @@ const select = (state, props) => ({
 export default connect(select, {
   doChannelSubscribe,
   doToast,
-})(NotificationContentChannelMenu);
+})(SubscribeButton);
diff --git a/ui/component/publishAdditionalOptions/index.js b/ui/component/publishAdditionalOptions/index.js
index 8a5a4f826..43bfaaf30 100644
--- a/ui/component/publishAdditionalOptions/index.js
+++ b/ui/component/publishAdditionalOptions/index.js
@@ -1,18 +1,18 @@
 import { connect } from 'react-redux';
 import { selectPublishFormValues, doUpdatePublishForm } from 'lbry-redux';
-import PublishAdditionalOptions from './view';
+import PublishPage from './view';
 import { selectUser, selectAccessToken } from 'redux/selectors/user';
 import { doFetchAccessToken } from 'redux/actions/user';
 
-const select = (state) => ({
+const select = state => ({
   ...selectPublishFormValues(state),
   accessToken: selectAccessToken(state),
   user: selectUser(state),
 });
 
-const perform = (dispatch) => ({
-  updatePublishForm: (value) => dispatch(doUpdatePublishForm(value)),
+const perform = dispatch => ({
+  updatePublishForm: value => dispatch(doUpdatePublishForm(value)),
   fetchAccessToken: () => dispatch(doFetchAccessToken()),
 });
 
-export default connect(select, perform)(PublishAdditionalOptions);
+export default connect(select, perform)(PublishPage);
diff --git a/ui/component/recommendedContent/index.js b/ui/component/recommendedContent/index.js
index 2d9444649..2bd985013 100644
--- a/ui/component/recommendedContent/index.js
+++ b/ui/component/recommendedContent/index.js
@@ -4,7 +4,7 @@ import { doFetchRecommendedContent } from 'redux/actions/search';
 import { makeSelectRecommendedContentForUri, selectIsSearching } from 'redux/selectors/search';
 import { selectUserVerifiedEmail } from 'redux/selectors/user';
 import { makeSelectNextUnplayedRecommended } from 'redux/selectors/content';
-import RecommendedContent from './view';
+import RecommendedVideos from './view';
 
 const select = (state, props) => ({
   mature: makeSelectClaimIsNsfw(props.uri)(state),
@@ -19,4 +19,4 @@ const perform = (dispatch) => ({
   doFetchRecommendedContent: (uri, mature) => dispatch(doFetchRecommendedContent(uri, mature)),
 });
 
-export default connect(select, perform)(RecommendedContent);
+export default connect(select, perform)(RecommendedVideos);
diff --git a/ui/page/channel/index.js b/ui/page/channel/index.js
index 9befca133..3b92172e5 100644
--- a/ui/page/channel/index.js
+++ b/ui/page/channel/index.js
@@ -7,7 +7,6 @@ import {
   selectCurrentChannelPage,
   makeSelectClaimForUri,
   makeSelectClaimIsPending,
-  selectMyUnpublishedCollections,
 } from 'lbry-redux';
 import { selectBlackListedOutpoints, doFetchSubCount, makeSelectSubCountForUri } from 'lbryinc';
 import { selectYoutubeChannels } from 'redux/selectors/user';
@@ -31,7 +30,6 @@ const select = (state, props) => ({
   youtubeChannels: selectYoutubeChannels(state),
   blockedChannels: selectModerationBlockList(state),
   mutedChannels: selectMutedChannels(state),
-  unpublishedCollections: selectMyUnpublishedCollections(state),
 });
 
 const perform = (dispatch) => ({
diff --git a/ui/page/channel/view.jsx b/ui/page/channel/view.jsx
index ac0105a13..8e0d21ed4 100644
--- a/ui/page/channel/view.jsx
+++ b/ui/page/channel/view.jsx
@@ -22,11 +22,9 @@ import ClaimSupportButton from 'component/claimSupportButton';
 import ChannelStakedIndicator from 'component/channelStakedIndicator';
 import ClaimMenuList from 'component/claimMenuList';
 import Yrbl from 'component/yrbl';
-import I18nMessage from 'component/i18nMessage';
 
 export const PAGE_VIEW_QUERY = `view`;
 const CONTENT_PAGE = 'content';
-const LISTS_PAGE = 'lists';
 const ABOUT_PAGE = `about`;
 export const DISCUSSION_PAGE = `discussion`;
 const EDIT_PAGE = 'edit';
@@ -52,7 +50,6 @@ type Props = {
   youtubeChannels: ?Array<{ channel_claim_id: string, sync_status: string, transfer_state: string }>,
   blockedChannels: Array<string>,
   mutedChannels: Array<string>,
-  unpublishedCollections: CollectionGroup,
 };
 
 function ChannelPage(props: Props) {
@@ -71,7 +68,6 @@ function ChannelPage(props: Props) {
     youtubeChannels,
     blockedChannels,
     mutedChannels,
-    unpublishedCollections,
   } = props;
   const {
     push,
@@ -102,31 +98,6 @@ function ChannelPage(props: Props) {
       }
     });
 
-  const hasUnpublishedCollections = unpublishedCollections && Object.keys(unpublishedCollections).length;
-
-  let collectionEmpty;
-  if (channelIsMine) {
-    collectionEmpty = hasUnpublishedCollections ? (
-      <section className="main--empty">
-        {
-          <p>
-            <I18nMessage
-              tokens={{
-                pick: <Button button="link" navigate={`/$/${PAGES.LISTS}`} label={__('Pick')} />,
-              }}
-            >
-              You have unpublished lists! %pick% one and publish it!
-            </I18nMessage>
-          </p>
-        }
-      </section>
-    ) : (
-      <section className="main--empty">{__('You have no lists! Create one from any playable content.')}</section>
-    );
-  } else {
-    collectionEmpty = <section className="main--empty">{__('No Lists Found')}</section>;
-  }
-
   let channelIsBlackListed = false;
 
   if (claim && blackListedOutpoints) {
@@ -143,14 +114,11 @@ function ChannelPage(props: Props) {
     case CONTENT_PAGE:
       tabIndex = 0;
       break;
-    case LISTS_PAGE:
+    case ABOUT_PAGE:
       tabIndex = 1;
       break;
-    case ABOUT_PAGE:
-      tabIndex = 2;
-      break;
     case DISCUSSION_PAGE:
-      tabIndex = 3;
+      tabIndex = 2;
       break;
     default:
       tabIndex = 0;
@@ -164,8 +132,6 @@ function ChannelPage(props: Props) {
     if (newTabIndex === 0) {
       search += `${PAGE_VIEW_QUERY}=${CONTENT_PAGE}`;
     } else if (newTabIndex === 1) {
-      search += `${PAGE_VIEW_QUERY}=${LISTS_PAGE}`;
-    } else if (newTabIndex === 2) {
       search += `${PAGE_VIEW_QUERY}=${ABOUT_PAGE}`;
     } else {
       search += `${PAGE_VIEW_QUERY}=${DISCUSSION_PAGE}`;
@@ -274,7 +240,6 @@ function ChannelPage(props: Props) {
         <Tabs onChange={onTabChange} index={tabIndex}>
           <TabList className="tabs__list--channel-page">
             <Tab disabled={editing}>{__('Content')}</Tab>
-            <Tab disabled={editing}>{__('Playlists')}</Tab>
             <Tab>{editing ? __('Editing Your Channel') : __('About --[tab title in Channel Page]--')}</Tab>
             <Tab disabled={editing}>{__('Community')}</Tab>
           </TabList>
@@ -287,15 +252,6 @@ function ChannelPage(props: Props) {
                 empty={<section className="main--empty">{__('No Content Found')}</section>}
               />
             </TabPanel>
-            <TabPanel>
-              <ChannelContent
-                claimType={'collection'}
-                uri={uri}
-                channelIsBlackListed={channelIsBlackListed}
-                viewHiddenChannels
-                empty={collectionEmpty}
-              />
-            </TabPanel>
             <TabPanel>
               <ChannelAbout uri={uri} />
             </TabPanel>
diff --git a/ui/page/channelsFollowing/view.jsx b/ui/page/channelsFollowing/view.jsx
index 4ae1fac6b..dfd270f48 100644
--- a/ui/page/channelsFollowing/view.jsx
+++ b/ui/page/channelsFollowing/view.jsx
@@ -2,7 +2,7 @@
 import * as PAGES from 'constants/pages';
 import * as ICONS from 'constants/icons';
 import * as CS from 'constants/claim_search';
-import { SIMPLE_SITE, ENABLE_NO_SOURCE_CLAIMS } from 'config';
+import { SIMPLE_SITE } from 'config';
 import React from 'react';
 import ChannelsFollowingDiscoverPage from 'page/channelsFollowingDiscover';
 import ClaimListDiscover from 'component/claimListDiscover';
@@ -47,7 +47,6 @@ function ChannelsFollowingPage(props: Props) {
         }
         liveLivestreamsFirst
         livestreamMap={livestreamMap}
-        showNoSourceClaims={ENABLE_NO_SOURCE_CLAIMS}
         hasSource
       />
     </Page>
diff --git a/ui/page/discover/view.jsx b/ui/page/discover/view.jsx
index 59a7a49d3..fca41e4fe 100644
--- a/ui/page/discover/view.jsx
+++ b/ui/page/discover/view.jsx
@@ -1,5 +1,5 @@
 // @flow
-import { SHOW_ADS, DOMAIN, SIMPLE_SITE, ENABLE_NO_SOURCE_CLAIMS } from 'config';
+import { SHOW_ADS, DOMAIN, SIMPLE_SITE } from 'config';
 import * as ICONS from 'constants/icons';
 import * as PAGES from 'constants/pages';
 import React, { useRef } from 'react';
@@ -153,7 +153,6 @@ function DiscoverPage(props: Props) {
         liveLivestreamsFirst
         livestreamMap={livestreamMap}
         hasSource
-        showNoSourceClaims={ENABLE_NO_SOURCE_CLAIMS}
       />
     </Page>
   );
diff --git a/ui/page/home/view.jsx b/ui/page/home/view.jsx
index d70398b62..bbfd1aad0 100644
--- a/ui/page/home/view.jsx
+++ b/ui/page/home/view.jsx
@@ -1,7 +1,7 @@
 // @flow
 import * as ICONS from 'constants/icons';
 import * as PAGES from 'constants/pages';
-import { SITE_NAME, SIMPLE_SITE, DOMAIN, ENABLE_NO_SOURCE_CLAIMS } from 'config';
+import { SITE_NAME, SIMPLE_SITE, DOMAIN } from 'config';
 import React from 'react';
 import Page from 'component/page';
 import Button from 'component/button';
@@ -13,6 +13,10 @@ import LbcSymbol from 'component/common/lbc-symbol';
 import WaitUntilOnPage from 'component/common/wait-until-on-page';
 import useGetLivestreams from 'effects/use-get-livestreams';
 
+// @if TARGET='web'
+import Pixel from 'web/component/pixel';
+// @endif
+
 type Props = {
   authenticated: boolean,
   followedTags: Array<Tag>,
@@ -43,20 +47,11 @@ function HomePage(props: Props) {
     const tilePlaceholder = (
       <ul className="claim-grid">
         {new Array(options.pageSize || 8).fill(1).map((x, i) => (
-          <ClaimPreviewTile showNoSourceClaims={ENABLE_NO_SOURCE_CLAIMS} key={i} placeholder />
+          <ClaimPreviewTile key={i} placeholder />
         ))}
       </ul>
     );
-    const claimTiles = (
-      <ClaimTilesDiscover
-        {...options}
-        liveLivestreamsFirst
-        livestreamMap={livestreamMap}
-        showNoSourceClaims={ENABLE_NO_SOURCE_CLAIMS}
-        hasSource
-        pin={route === `/$/${PAGES.GENERAL}`}
-      />
-    );
+    const claimTiles = <ClaimTilesDiscover {...options} liveLivestreamsFirst livestreamMap={livestreamMap} hasSource />;
 
     return (
       <div key={title} className="claim-grid__wrapper">
@@ -137,6 +132,9 @@ function HomePage(props: Props) {
       {rowData.map(({ title, route, link, icon, help, options = {} }, index) => {
         return getRowElements(title, route, link, icon, help, options, index);
       })}
+      {/* @if TARGET='web' */}
+      <Pixel type={'retargeting'} />
+      {/* @endif */}
     </Page>
   );
 }
diff --git a/ui/page/settingsAdvanced/index.js b/ui/page/settingsAdvanced/index.js
index c42fac57f..1997160cf 100644
--- a/ui/page/settingsAdvanced/index.js
+++ b/ui/page/settingsAdvanced/index.js
@@ -17,10 +17,10 @@ import {
   selectFindingFFmpeg,
 } from 'redux/selectors/settings';
 import { doWalletStatus, selectWalletIsEncrypted, SETTINGS } from 'lbry-redux';
-import SettingsAdvancedPage from './view';
+import SettingsPage from './view';
 import { selectUserVerifiedEmail } from 'redux/selectors/user';
 
-const select = (state) => ({
+const select = state => ({
   daemonSettings: selectDaemonSettings(state),
   allowAnalytics: selectAllowAnalytics(state),
   isAuthenticated: selectUserVerifiedEmail(state),
@@ -34,18 +34,18 @@ const select = (state) => ({
   syncEnabled: makeSelectClientSetting(SETTINGS.ENABLE_SYNC)(state),
 });
 
-const perform = (dispatch) => ({
+const perform = dispatch => ({
   setDaemonSetting: (key, value) => dispatch(doSetDaemonSetting(key, value)),
-  clearDaemonSetting: (key) => dispatch(doClearDaemonSetting(key)),
+  clearDaemonSetting: key => dispatch(doClearDaemonSetting(key)),
   clearCache: () => dispatch(doClearCache()),
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
   encryptWallet: () => dispatch(doNotifyEncryptWallet()),
   decryptWallet: () => dispatch(doNotifyDecryptWallet()),
   updateWalletStatus: () => dispatch(doWalletStatus()),
-  confirmForgetPassword: (modalProps) => dispatch(doNotifyForgetPassword(modalProps)),
+  confirmForgetPassword: modalProps => dispatch(doNotifyForgetPassword(modalProps)),
   findFFmpeg: () => dispatch(doFindFFmpeg()),
   enterSettings: () => dispatch(doEnterSettingsPage()),
   exitSettings: () => dispatch(doExitSettingsPage()),
 });
 
-export default connect(select, perform)(SettingsAdvancedPage);
+export default connect(select, perform)(SettingsPage);
diff --git a/ui/page/settingsAdvanced/view.jsx b/ui/page/settingsAdvanced/view.jsx
index 4850d35f0..ef283f32a 100644
--- a/ui/page/settingsAdvanced/view.jsx
+++ b/ui/page/settingsAdvanced/view.jsx
@@ -38,7 +38,7 @@ type DaemonSettings = {
 
 type Props = {
   setDaemonSetting: (string, ?SetDaemonSettingArg) => void,
-  clearDaemonSetting: (string) => void,
+  clearDaemonSetting: string => void,
   setClientSetting: (string, SetDaemonSettingArg) => void,
   daemonSettings: DaemonSettings,
   isAuthenticated: boolean,
@@ -64,7 +64,7 @@ type State = {
   storedPassword: boolean,
 };
 
-class SettingsAdvancedPage extends React.PureComponent<Props, State> {
+class SettingsPage extends React.PureComponent<Props, State> {
   constructor(props: Props) {
     super(props);
 
@@ -98,7 +98,7 @@ class SettingsAdvancedPage extends React.PureComponent<Props, State> {
 
     if (isAuthenticated || !IS_WEB) {
       this.props.updateWalletStatus();
-      getPasswordFromCookie().then((p) => {
+      getPasswordFromCookie().then(p => {
         if (typeof p === 'string') {
           this.setState({ storedPassword: true });
         }
@@ -493,7 +493,7 @@ class SettingsAdvancedPage extends React.PureComponent<Props, State> {
                         onChange={this.onMaxConnectionsChange}
                         value={daemonSettings.max_connections_per_download}
                       >
-                        {connectionOptions.map((connectionOption) => (
+                        {connectionOptions.map(connectionOption => (
                           <option key={connectionOption} value={connectionOption}>
                             {connectionOption}
                           </option>
@@ -521,4 +521,4 @@ class SettingsAdvancedPage extends React.PureComponent<Props, State> {
   }
 }
 
-export default SettingsAdvancedPage;
+export default SettingsPage;
diff --git a/ui/page/settingsNotifications/index.js b/ui/page/settingsNotifications/index.js
index 5fd5a5e25..b06b0cb73 100644
--- a/ui/page/settingsNotifications/index.js
+++ b/ui/page/settingsNotifications/index.js
@@ -2,15 +2,15 @@ import { connect } from 'react-redux';
 import { doSetClientSetting } from 'redux/actions/settings';
 import { selectosNotificationsEnabled } from 'redux/selectors/settings';
 import { selectUserVerifiedEmail } from 'redux/selectors/user';
-import NotificationSettingsPage from './view';
+import SettingsPage from './view';
 
-const select = (state) => ({
+const select = state => ({
   osNotificationsEnabled: selectosNotificationsEnabled(state),
   isAuthenticated: Boolean(selectUserVerifiedEmail(state)),
 });
 
-const perform = (dispatch) => ({
+const perform = dispatch => ({
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
 });
 
-export default connect(select, perform)(NotificationSettingsPage);
+export default connect(select, perform)(SettingsPage);
diff --git a/ui/page/settingsStripeCard/index.js b/ui/page/settingsStripeCard/index.js
index 1741b6ff2..c74607b04 100644
--- a/ui/page/settingsStripeCard/index.js
+++ b/ui/page/settingsStripeCard/index.js
@@ -3,16 +3,16 @@ import { doSetClientSetting } from 'redux/actions/settings';
 import { selectosNotificationsEnabled } from 'redux/selectors/settings';
 import { selectUserVerifiedEmail, selectUserEmail } from 'redux/selectors/user';
 
-import SettingsStripeCard from './view';
+import SettingsPage from './view';
 
-const select = (state) => ({
+const select = state => ({
   osNotificationsEnabled: selectosNotificationsEnabled(state),
   isAuthenticated: Boolean(selectUserVerifiedEmail(state)),
   email: selectUserEmail(state),
 });
 
-const perform = (dispatch) => ({
+const perform = dispatch => ({
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
 });
 
-export default connect(select, perform)(SettingsStripeCard);
+export default connect(select, perform)(SettingsPage);
diff --git a/ui/page/settingsStripeCard/view.jsx b/ui/page/settingsStripeCard/view.jsx
index ae9eb5bb9..7f58a0bcd 100644
--- a/ui/page/settingsStripeCard/view.jsx
+++ b/ui/page/settingsStripeCard/view.jsx
@@ -35,7 +35,7 @@ if (STRIPE_PUBLIC_KEY.indexOf('pk_live') > -1) {
 //   scriptFailedToLoad: boolean,
 // };
 
-class SettingsStripeCard extends React.Component<Props, State> {
+class CardVerify extends React.Component<Props, State> {
   constructor(props) {
     // :Props
     super(props);
@@ -472,6 +472,6 @@ class SettingsStripeCard extends React.Component<Props, State> {
   }
 }
 
-export default SettingsStripeCard;
+export default CardVerify;
 /* eslint-enable no-undef */
 /* eslint-enable react/prop-types */
diff --git a/ui/page/signInVerify/view.jsx b/ui/page/signInVerify/view.jsx
index 8abb8495b..39964e677 100644
--- a/ui/page/signInVerify/view.jsx
+++ b/ui/page/signInVerify/view.jsx
@@ -8,9 +8,11 @@ import Button from 'component/button';
 import { Lbryio } from 'lbryinc';
 import I18nMessage from 'component/i18nMessage';
 import Card from 'component/common/card';
-
+// @if TARGET='web'
+import Pixel from 'web/component/pixel';
+// @endif
 type Props = {
-  history: { push: string => void, location: { search: string } },
+  history: { push: (string) => void, location: { search: string } },
   doToast: ({}) => void,
 };
 
@@ -132,6 +134,9 @@ function SignInVerifyPage(props: Props) {
           }
         />
       </div>
+      {/* @if TARGET='web' */}
+      <Pixel type={'kill'} />
+      {/* @endif */}
     </Page>
   );
 }
diff --git a/ui/scss/component/_claim-list.scss b/ui/scss/component/_claim-list.scss
index e0cdab712..d5602e264 100644
--- a/ui/scss/component/_claim-list.scss
+++ b/ui/scss/component/_claim-list.scss
@@ -94,10 +94,6 @@
 
 .claim-preview__wrapper--small {
   padding: var(--spacing-s);
-
-  .button--uri-indicator {
-    max-width: 12rem;
-  }
 }
 
 .claim-preview {
diff --git a/ui/scss/component/_search.scss b/ui/scss/component/_search.scss
index 1fcb5f2c0..db1272154 100644
--- a/ui/scss/component/_search.scss
+++ b/ui/scss/component/_search.scss
@@ -128,12 +128,10 @@
 }
 
 .recommended-content__toggles {
-  margin-top: var(--spacing-xs);
-  margin-right: var(--spacing-xs);
+  margin-right: var(--spacing-s);
 
   button {
     padding: 0 var(--spacing-xs);
     height: 2rem;
-    max-width: 15rem;
   }
 }
diff --git a/ui/scss/component/_snack-bar.scss b/ui/scss/component/_snack-bar.scss
index 57d51e318..faff99c7b 100644
--- a/ui/scss/component/_snack-bar.scss
+++ b/ui/scss/component/_snack-bar.scss
@@ -47,8 +47,6 @@
 }
 
 .snack-bar__message {
-  overflow: hidden;
-  text-overflow: ellipsis;
   align-items: center;
   display: flex;
   flex-direction: row;
diff --git a/ui/util/url.js b/ui/util/url.js
index 89646ce07..ef950d5de 100644
--- a/ui/util/url.js
+++ b/ui/util/url.js
@@ -150,6 +150,6 @@ export const generateShareUrl = (
 
 export const generateRssUrl = (domain, lbryUrl) => {
   const { channelName, channelClaimId } = parseURI(lbryUrl);
-  const url = `${domain}/$/rss/@${channelName}/${channelClaimId.slice(0, 2)}`;
+  const url = `${domain}/$/rss/@${channelName}/${channelClaimId}`;
   return url;
 };
diff --git a/web/component/pixel.jsx b/web/component/pixel.jsx
new file mode 100644
index 000000000..697e378d3
--- /dev/null
+++ b/web/component/pixel.jsx
@@ -0,0 +1,36 @@
+// @flow
+import React from 'react';
+import { SIMPLE_SITE } from 'config';
+type Props = {
+  type: string,
+};
+
+const Pixel = (props: Props) => {
+  const { type } = props;
+  if (!SIMPLE_SITE) {
+    return null;
+  }
+  if (type === 'retargeting') {
+    return (
+      <>
+        <img
+          src="https://ctrack.trafficjunky.net/ctrack?action=list&type=add&id=0&context=Odysee&cookiename=RetargetingPixel&age=44000&maxcookiecount=10"
+          alt=""
+        />
+      </>
+    );
+  } else if (type === 'kill') {
+    return (
+      <>
+        <img
+          src="https://ctrack.trafficjunky.net/ctrack?action=list&type=add&id=0&context=Odysee&cookiename=KillPixel&age=0&maxcookiecount=10"
+          alt=""
+        />
+      </>
+    );
+  } else {
+    return null;
+  }
+};
+
+export default Pixel;
diff --git a/web/src/rss.js b/web/src/rss.js
index d5f6d3077..241521c3b 100644
--- a/web/src/rss.js
+++ b/web/src/rss.js
@@ -6,8 +6,6 @@ const SDK_API_PATH = `${LBRY_WEB_API}/api/v1`;
 const proxyURL = `${SDK_API_PATH}/proxy`;
 Lbry.setDaemonConnectionString(proxyURL);
 
-const NUM_ENTRIES = 500;
-
 async function doClaimSearch(options) {
   let results;
   try {
@@ -16,17 +14,15 @@ async function doClaimSearch(options) {
   return results ? results.items : undefined;
 }
 
-async function getChannelClaim(name, claimId) {
-  let claim;
-  try {
-    const url = `lbry://${name}#${claimId}`;
-    const response = await Lbry.resolve({ urls: [url] });
+async function getChannelClaim(claimId) {
+  const options = {
+    claim_ids: [claimId],
+    page_size: 1,
+    no_totals: true,
+  };
 
-    if (response && response[url] && !response[url].error) {
-      claim = response && response[url];
-    }
-  } catch {}
-  return claim || 'The RSS URL is invalid or is not associated with any channel.';
+  const claims = await doClaimSearch(options);
+  return claims ? claims[0] : undefined;
 }
 
 async function getClaimsFromChannel(claimId, count) {
@@ -42,49 +38,40 @@ async function getClaimsFromChannel(claimId, count) {
   return await doClaimSearch(options);
 }
 
-async function getFeed(channelClaim, feedLink) {
-  const replaceLineFeeds = (str) => str.replace(/(?:\r\n|\r|\n)/g, '<br />');
-  const fmtDescription = (description) => replaceLineFeeds(description);
-  const sanitizeThumbsUrl = (url) => {
-    if (typeof url === 'string' && url.startsWith('https://')) {
-      return encodeURI(url).replace(/&/g, '%26');
-    }
-    return '';
-  };
+async function getFeed(channelClaim) {
+  const replaceLineFeeds = (str) => str.replace(/(?:\r\n|\r|\n)/g, '<br>');
 
   const value = channelClaim.value;
   const title = value ? value.title : channelClaim.name;
 
   const options = {
+    title: title + ' on ' + SITE_NAME,
+    description: value && value.description ? replaceLineFeeds(value.description) : '',
+    link: `${URL}/${channelClaim.name}:${channelClaim.claim_id}`,
     favicon: URL + '/public/favicon.png',
     generator: SITE_NAME + ' RSS Feed',
-    title: title + ' on ' + SITE_NAME,
-    description: fmtDescription(value && value.description ? value.description : ''),
-    link: encodeURI(`${URL}/${channelClaim.name}:${channelClaim.claim_id}`),
-    image: sanitizeThumbsUrl(value && value.thumbnail ? value.thumbnail.url : ''),
-    feedLinks: {
-      rss: encodeURI(feedLink),
-    },
+    image: value && value.thumbnail ? value.thumbnail.url : '',
     author: {
-      name: encodeURI(channelClaim.name),
-      link: encodeURI(URL + '/' + channelClaim.name + ':' + channelClaim.claim_id),
+      name: channelClaim.name,
+      link: URL + '/' + channelClaim.name + ':' + channelClaim.claim_id,
     },
   };
 
   const feed = new Feed(options);
-  const latestClaims = await getClaimsFromChannel(channelClaim.claim_id, NUM_ENTRIES);
+
+  const latestClaims = await getClaimsFromChannel(channelClaim.claim_id, 50);
 
   latestClaims.forEach((c) => {
     const meta = c.meta;
     const value = c.value;
 
     feed.addItem({
+      guid: c.claim_id,
       id: c.claim_id,
-      guid: encodeURI(URL + '/' + c.name + ':' + c.claim_id),
-      title: value && value.title ? value.title : c.name,
-      description: fmtDescription(value && value.description ? value.description : ''),
-      image: sanitizeThumbsUrl(value && value.thumbnail ? value.thumbnail.url : ''),
-      link: encodeURI(URL + '/' + c.name + ':' + c.claim_id),
+      title: value ? value.title : c.name,
+      description: value && value.description ? replaceLineFeeds(value.description) : '',
+      image: value && value.thumbnail ? value.thumbnail.url : '',
+      link: URL + '/' + c.name + ':' + c.claim_id,
       date: new Date(meta ? meta.creation_timestamp * 1000 : null),
     });
   });
@@ -92,24 +79,18 @@ async function getFeed(channelClaim, feedLink) {
   return feed;
 }
 
-function postProcess(feed) {
-  // Handle 'Feed' creating an invalid MIME type when trying to guess
-  // from 'https://thumbnails.lbry.com/UCgQ8eREJzR1dO' style of URLs.
-  return feed.replace(/type="image\/\/.*"\/>/g, 'type="image/*"/>');
-}
-
 async function getRss(ctx) {
   if (!ctx.params.claimName || !ctx.params.claimId) {
     return 'Invalid URL';
   }
 
-  const channelClaim = await getChannelClaim(ctx.params.claimName, ctx.params.claimId);
+  const channelClaim = await getChannelClaim(ctx.params.claimId);
   if (typeof channelClaim === 'string' || !channelClaim) {
     return channelClaim;
   }
 
-  const feed = await getFeed(channelClaim, `${URL}/$/rss/${ctx.params.claimName}/${ctx.params.claimId}`);
-  return postProcess(feed.rss2());
+  const feed = await getFeed(channelClaim);
+  return feed.rss2();
 }
 
 module.exports = { getRss };