diff --git a/ui/analytics.js b/ui/analytics.js
index 3ff053bc1..242767d9f 100644
--- a/ui/analytics.js
+++ b/ui/analytics.js
@@ -43,7 +43,8 @@ type LogPublishParams = {
   channel_claim_id?: string,
 };
 
-let analyticsEnabled: boolean = true;
+let analyticsEnabled: boolean = isProduction;
+
 const analytics: Analytics = {
   error: message => {
     if (analyticsEnabled && isProduction) {
diff --git a/ui/component/header/view.jsx b/ui/component/header/view.jsx
index bba777a34..04cb8176c 100644
--- a/ui/component/header/view.jsx
+++ b/ui/component/header/view.jsx
@@ -147,13 +147,17 @@ const Header = (props: Props) => {
                     </MenuItem>
                     <MenuItem className="menu__link" onSelect={() => history.push(`/$/${PAGES.PUBLISHED}`)}>
                       <Icon aria-hidden icon={ICONS.PUBLISH} />
-                      {__('Your Publishes')}
+                      {__('Publishes')}
+                    </MenuItem>
+                    <MenuItem className="menu__link" onSelect={() => history.push(`/$/${PAGES.PUBLISHED}`)}>
+                      <Icon aria-hidden icon={ICONS.CHANNEL} />
+                      {__('Channels')}
                     </MenuItem>
 
                     {/* @if TARGET='app' */}
                     <MenuItem className="menu__link" onSelect={() => history.push(`/$/${PAGES.PUBLISH}`)}>
                       <Icon aria-hidden icon={ICONS.LIBRARY} />
-                      {__('Your Library')}
+                      {__('Library')}
                     </MenuItem>
                     {/* @endif */}
 
diff --git a/ui/component/router/view.jsx b/ui/component/router/view.jsx
index 77e09cbe0..c1ddf8508 100644
--- a/ui/component/router/view.jsx
+++ b/ui/component/router/view.jsx
@@ -98,7 +98,7 @@ function AppRouter(props: Props) {
       <PrivateRoute {...props} path={`/$/${PAGES.REWARDS}`} component={RewardsPage} />
       <PrivateRoute {...props} path={`/$/${PAGES.TRANSACTIONS}`} component={TransactionHistoryPage} />
       <PrivateRoute {...props} path={`/$/${PAGES.LIBRARY}`} component={LibraryPage} />
-      <PrivateRoute {...props} path={`/$/${PAGES.FOLLOWING}`} component={FollowingPage} />
+      <PrivateRoute {...props} path={`/$/${PAGES.TAGS_FOLLOWING_MANAGE}`} component={FollowingPage} />
       <PrivateRoute {...props} path={`/$/${PAGES.BLOCKED}`} component={ListBlockedPage} />
       <PrivateRoute {...props} path={`/$/${PAGES.WALLET}`} exact component={WalletPage} />
       <PrivateRoute {...props} path={`/$/${PAGES.CHANNELS}`} component={ChannelsPage} />
diff --git a/ui/constants/pages.js b/ui/constants/pages.js
index 15cc6a9ab..b94baa99e 100644
--- a/ui/constants/pages.js
+++ b/ui/constants/pages.js
@@ -21,9 +21,9 @@ exports.SEARCH = 'search';
 exports.TRANSACTIONS = 'transactions';
 exports.TAGS = 'tags';
 exports.TAGS_FOLLOWING = 'following/tags';
+exports.TAGS_FOLLOWING_MANAGE = 'following/tags/manage';
 exports.CHANNELS_FOLLOWING = 'following/channels';
 exports.CHANNELS_FOLLOWING_MANAGE = 'following/channels/manage';
-exports.FOLLOWING = 'following';
 exports.WALLET = 'wallet';
 exports.BLOCKED = 'blocked';
 exports.CHANNELS = 'channels';
diff --git a/ui/page/channel/view.jsx b/ui/page/channel/view.jsx
index be3f77167..08dea0382 100644
--- a/ui/page/channel/view.jsx
+++ b/ui/page/channel/view.jsx
@@ -163,6 +163,8 @@ function ChannelPage(props: Props) {
 
   return (
     <Page>
+      <ClaimUri uri={uri} />
+
       <div className="card">
         <header className="channel-cover">
           <div className="channel__quick-actions">
@@ -212,7 +214,6 @@ function ChannelPage(props: Props) {
               <Button button="alt" title={__('Edit')} onClick={() => setEditing(!editing)} icon={ICONS.EDIT} />
             )}
             <div className="channel__meta">
-              <ClaimUri uri={uri} inline />
               <span>
                 {subCount} {subCount !== 1 ? __('Followers') : __('Follower')}
                 <HelpLink href="https://lbry.com/faq/views" />
diff --git a/ui/page/following/view.jsx b/ui/page/following/view.jsx
index 5de0a1c9c..fd9412826 100644
--- a/ui/page/following/view.jsx
+++ b/ui/page/following/view.jsx
@@ -24,7 +24,7 @@ function FollowingPage(props: Props) {
   const viewingSuggestedSubs = urlParams.get('view') || !hasSubscriptions;
 
   function onClick() {
-    let url = `/$/${PAGES.FOLLOWING}`;
+    let url = `/$/${PAGES.TAGS_FOLLOWING_MANAGE}`;
     if (!viewingSuggestedSubs) {
       url += '?view=discover';
     }
diff --git a/ui/page/search/view.jsx b/ui/page/search/view.jsx
index ee0b86734..dc29a604d 100644
--- a/ui/page/search/view.jsx
+++ b/ui/page/search/view.jsx
@@ -60,30 +60,29 @@ export default function SearchPage(props: Props) {
               </header>
             )}
 
-            <div className="card">
-              <ClaimList
-                uris={uris}
-                loading={isSearching}
-                header={<SearchOptions />}
-                headerAltControls={
-                  <Fragment>
-                    <span>{__('Find what you were looking for?')}</span>
-                    <Button
-                      button="alt"
-                      description={__('Yes')}
-                      onClick={() => onFeedbackPositive(urlQuery)}
-                      icon={ICONS.YES}
-                    />
-                    <Button
-                      button="alt"
-                      description={__('No')}
-                      onClick={() => onFeedbackNegative(urlQuery)}
-                      icon={ICONS.NO}
-                    />
-                  </Fragment>
-                }
-              />
-            </div>
+            <ClaimList
+              uris={uris}
+              loading={isSearching}
+              header={<SearchOptions />}
+              headerAltControls={
+                <Fragment>
+                  <span>{__('Find what you were looking for?')}</span>
+                  <Button
+                    button="alt"
+                    description={__('Yes')}
+                    onClick={() => onFeedbackPositive(urlQuery)}
+                    icon={ICONS.YES}
+                  />
+                  <Button
+                    button="alt"
+                    description={__('No')}
+                    onClick={() => onFeedbackNegative(urlQuery)}
+                    icon={ICONS.NO}
+                  />
+                </Fragment>
+              }
+            />
+
             <div className="help">{__('These search results are provided by LBRY, Inc.')}</div>
           </Fragment>
         )}
diff --git a/ui/page/tags/view.jsx b/ui/page/tags/view.jsx
index e67ab613a..9b28af60b 100644
--- a/ui/page/tags/view.jsx
+++ b/ui/page/tags/view.jsx
@@ -7,6 +7,7 @@ import Button from 'component/button';
 import useHover from 'effects/use-hover';
 import analytics from 'analytics';
 import HiddenNsfw from 'component/common/hidden-nsfw';
+import Icon from 'component/common/icon';
 
 type Props = {
   location: { search: string },
@@ -46,6 +47,12 @@ function TagsPage(props: Props) {
   return (
     <Page>
       <ClaimListDiscover
+        headerLabel={
+          <span>
+            <Icon icon={ICONS.TAG} size={10} />
+            {tag}
+          </span>
+        }
         tags={tags}
         hiddenNsfwMessage={<HiddenNsfw type="page" />}
         meta={
diff --git a/ui/page/tagsFollowing/view.jsx b/ui/page/tagsFollowing/view.jsx
index 3961b1335..c988c9e94 100644
--- a/ui/page/tagsFollowing/view.jsx
+++ b/ui/page/tagsFollowing/view.jsx
@@ -35,7 +35,7 @@ function DiscoverPage(props: Props) {
             icon={ICONS.EDIT}
             label={__('Manage')}
             requiresAuth={IS_WEB}
-            navigate={`/$/${PAGES.FOLLOWING}`}
+            navigate={`/$/${PAGES.TAGS_FOLLOWING_MANAGE}`}
           />
         }
       />
diff --git a/ui/scss/component/_claim-list.scss b/ui/scss/component/_claim-list.scss
index 1a4acfaf2..5f9a685ae 100644
--- a/ui/scss/component/_claim-list.scss
+++ b/ui/scss/component/_claim-list.scss
@@ -6,33 +6,29 @@
 
 .claim-list__header {
   display: flex;
+  flex-wrap: wrap;
   align-items: center;
-  min-height: 3rem;
   margin: var(--spacing-medium) 0;
   margin-top: 0;
   font-size: var(--font-body);
 
-  fieldset-section {
-    margin-top: 0;
-    margin-bottom: 0;
+  .spinner {
+    margin-left: var(--spacing-medium);
   }
 }
 
 .claim-list__header--small {
-  min-height: 0;
   color: var(--color-text-subtitle);
 }
 
 .claim-list__dropdown {
   padding: 0 var(--spacing-medium);
-  padding-right: var(--spacing-large);
-  margin-bottom: 0;
   margin-left: var(--spacing-medium);
+  margin-right: var(--spacing-medium);
 
   @media (max-width: $breakpoint-small) {
-    font-size: var(--font-small);
-    padding: 0 var(--spacing-small);
-    padding-right: var(--spacing-large);
+    margin-top: var(--spacing-small);
+    margin-left: 0;
   }
 }