diff --git a/src/ui/component/comment/index.js b/src/ui/component/comment/index.js
new file mode 100644
index 000000000..ec92bc310
--- /dev/null
+++ b/src/ui/component/comment/index.js
@@ -0,0 +1,7 @@
+import { connect } from 'react-redux';
+import Comment from './view';
+
+export default connect(
+  null,
+  null
+)(Comment);
diff --git a/src/ui/component/comment/view.jsx b/src/ui/component/comment/view.jsx
new file mode 100644
index 000000000..096f35642
--- /dev/null
+++ b/src/ui/component/comment/view.jsx
@@ -0,0 +1,36 @@
+// @flow
+import React from 'react';
+import relativeDate from 'tiny-relative-date';
+
+type Props = {
+  author: string,
+  message: string,
+  timePosted: number,
+};
+
+function Comment(props: Props) {
+  const { author, timePosted, message } = props;
+
+  return (
+    <li className="comment">
+      <div className="comment__meta card__actions--between">
+        <strong>{author || __('Anonymous')}</strong>
+
+        <time dateTime={timePosted}>{relativeDate(timePosted)}</time>
+      </div>
+
+      <p>{message}</p>
+      {/* The following is for adding threaded replies, upvoting and downvoting */}
+      {/* <div className="comment__actions card__actions--between"> */}
+      {/*  <button className={'button button--primary'}>Reply</button> */}
+
+      {/*  <span className="comment__actions-wrap"> */}
+      {/*    <button className="comment__action upvote">Up</button> */}
+      {/*    <button className="comment__action downvote">Down</button> */}
+      {/*  </span> */}
+      {/* </div> */}
+    </li>
+  );
+}
+
+export default Comment;
diff --git a/src/ui/component/commentCreate/view.jsx b/src/ui/component/commentCreate/view.jsx
index bf2d51cc7..f0da4d393 100644
--- a/src/ui/component/commentCreate/view.jsx
+++ b/src/ui/component/commentCreate/view.jsx
@@ -1,11 +1,11 @@
 // @flow
+import { CHANNEL_NEW } from 'constants/claim';
 import React from 'react';
 import { FormField, Form } from 'component/common/form';
 import Button from 'component/button';
 import ChannelSection from 'component/selectChannel';
 import usePersistedState from 'util/use-persisted-state';
 
-// props:
 type Props = {
   uri: string,
   claim: StreamClaim,
@@ -13,12 +13,11 @@ type Props = {
 };
 
 export function CommentCreate(props: Props) {
-  const COMMENT_ACKNOWLEDGED = 'COMMENT_ACKNOWLEDGED';
   const { createComment, claim } = props;
   const { claim_id: claimId } = claim;
   const [commentValue, setCommentValue] = usePersistedState(`comment-${claimId}`, '');
-  const [commentAck, setCommentAck] = usePersistedState(COMMENT_ACKNOWLEDGED, false);
-  const [channel, setChannel] = usePersistedState('COMMENT_CHANNEL', 'anonymous');
+  const [commentAck, setCommentAck] = usePersistedState('comment-acknowledge', false);
+  const [channel, setChannel] = usePersistedState('comment-channel', 'anonymous');
 
   function handleCommentChange(event) {
     setCommentValue(event.target.value);
@@ -32,19 +31,19 @@ export function CommentCreate(props: Props) {
     setCommentAck(true);
   }
   function handleSubmit() {
-    if (channel !== 'new' && commentValue.length) createComment(commentValue, claimId, channel);
+    if (channel !== CHANNEL_NEW && commentValue.length) createComment(commentValue, claimId, channel);
     setCommentValue('');
   }
 
   return (
     <React.Fragment>
       {commentAck !== true && (
-        <section className="card card--section">
+        <section>
           <div className="card__content">
             <div className="media__title">About comments..</div>
           </div>
           <div className="card__content">
-            <div className="media__subtitle">Seriously, don&apos;t comment.</div>
+            <div className="media__subtitle">I acknowledge something.</div>
           </div>
           <div className="card__content">
             <Button button="primary" onClick={handleCommentAck} label={__('Got it!')} />
@@ -52,26 +51,26 @@ export function CommentCreate(props: Props) {
         </section>
       )}
       {commentAck === true && (
-        <section className="card card--section">
+        <section>
           <Form onSubmit={handleSubmit}>
             <div className="card__content">
               <ChannelSection channel={channel} onChannelChange={handleChannelChange} />
             </div>
             <div className="card__content">
               <FormField
-                disabled={channel === 'new'}
+                disabled={channel === CHANNEL_NEW}
                 type="textarea"
                 name="content_description"
-                label={__('Text')}
+                label={__('Comment')}
                 placeholder={__('Your comment')}
                 value={commentValue}
                 onChange={handleCommentChange}
               />
             </div>
-            <div className="card__content">
+            <div className="card__actions">
               <Button
                 button="primary"
-                disabled={channel === 'new' || !commentValue.length}
+                disabled={channel === CHANNEL_NEW || !commentValue.length}
                 type="submit"
                 label={__('Post')}
               />
diff --git a/src/ui/component/commentsList/index.js b/src/ui/component/commentsList/index.js
index 1cda71ebc..324fe767b 100644
--- a/src/ui/component/commentsList/index.js
+++ b/src/ui/component/commentsList/index.js
@@ -1,15 +1,15 @@
 import { connect } from 'react-redux';
-import { makeSelectCommentsForUri, makeSelectClaimForUri, doCommentList } from 'lbry-redux';
+import { makeSelectCommentsForUri, doCommentList } from 'lbry-redux';
 import CommentsList from './view';
 
 const select = (state, props) => ({
   comments: makeSelectCommentsForUri(props.uri)(state),
-  claim: makeSelectClaimForUri(props.uri)(state),
 });
 
 const perform = dispatch => ({
-  fetchList: uri => dispatch(doCommentList(uri)),
+  fetchComments: uri => dispatch(doCommentList(uri)),
 });
+
 export default connect(
   select,
   perform
diff --git a/src/ui/component/commentsList/view.jsx b/src/ui/component/commentsList/view.jsx
index 23f723681..bc4cfbaa7 100644
--- a/src/ui/component/commentsList/view.jsx
+++ b/src/ui/component/commentsList/view.jsx
@@ -1,86 +1,38 @@
 // @flow
-import * as React from 'react';
-import relativeDate from 'tiny-relative-date';
+import React, { useEffect } from 'react';
+import Comment from 'component/comment';
 
-type CommentListProps = {
+type Props = {
   comments: Array<any>,
-  fetchList: string => void,
+  fetchComments: string => void,
   uri: string,
-  isLoading: boolean,
 };
 
-type CommentProps = {
-  commentId: string,
-  claimId: string,
-  author: string,
-  message: string,
-  parentId: number,
-  timePosted: number,
-};
+function CommentList(props: Props) {
+  const { fetchComments, uri, comments } = props;
 
-class CommentList extends React.PureComponent<CommentListProps> {
-  componentDidMount() {
-    this.fetchComments(this.props);
-  }
+  useEffect(() => {
+    fetchComments(uri);
+  }, [fetchComments, uri]);
 
-  fetchComments = (props: CommentListProps) => {
-    const { fetchList, uri } = props;
-    fetchList(uri);
-  };
-
-  render() {
-    const { comments } = this.props;
-
-    if (!comments) {
-      return null;
-    }
-
-    return (
-      <section>
-        <ul className="comments">
-          {comments.map(comment => {
-            return (
-              <Comment
-                author={comment.channel_name}
-                claimId={comment.channel_id}
-                commentId={comment.comment_id}
-                key={comment.channel_id + comment.comment_id}
-                message={comment.comment}
-                parentId={comment.parent_id || null}
-                timePosted={comment.timestamp * 1000}
-              />
-            );
-          })}
-        </ul>
-      </section>
-    );
-  }
-}
-
-class Comment extends React.PureComponent<CommentProps> {
-  render() {
-    return (
-      <li className={this.props.parentId ? 'comment reply' : 'comment'}>
-        <div className="comment__meta card__actions--between">
-          {this.props.author && <strong>{this.props.author}</strong>}
-          {!this.props.author && <strong>Anonymous</strong>}
-
-          <time dateTime={this.props.timePosted}>{relativeDate(this.props.timePosted)}</time>
-        </div>
-
-        <div className="comment__content">{this.props.message}</div>
-        {/* The following is for adding threaded replies, upvoting and downvoting */}
-        {/* <div className="comment__actions card__actions--between"> */}
-        {/*  <button className={'button button--primary'}>Reply</button> */}
-
-        {/*  <span className="comment__actions-wrap"> */}
-        {/*    <button className="comment__action upvote">Up</button> */}
-        {/*    <button className="comment__action downvote">Down</button> */}
-        {/*  </span> */}
-        {/* </div> */}
-      </li>
-    );
-  }
+  return (
+    <ul className="comments">
+      {comments &&
+        comments.map(comment => {
+          return (
+            <Comment
+              author={comment.channel_name}
+              claimId={comment.channel_id}
+              commentId={comment.comment_id}
+              key={comment.channel_id + comment.comment_id}
+              message={comment.comment}
+              parentId={comment.parent_id || null}
+              timePosted={comment.timestamp * 1000}
+            />
+          );
+        })}
+    </ul>
+  );
 }
 
 export default CommentList;
diff --git a/src/ui/component/common/form-components/form-field.jsx b/src/ui/component/common/form-components/form-field.jsx
index 17deb99ca..37a9e55e2 100644
--- a/src/ui/component/common/form-components/form-field.jsx
+++ b/src/ui/component/common/form-components/form-field.jsx
@@ -154,6 +154,7 @@ export class FormField extends React.PureComponent<Props> {
       } else if (type === 'textarea') {
         input = (
           <fieldset-section>
+            <label htmlFor={name}>{label}</label>
             <textarea type={type} id={name} {...inputProps} />
           </fieldset-section>
         );
diff --git a/src/ui/component/fileViewer/view.jsx b/src/ui/component/fileViewer/view.jsx
index 58110f3a0..bb2402668 100644
--- a/src/ui/component/fileViewer/view.jsx
+++ b/src/ui/component/fileViewer/view.jsx
@@ -76,6 +76,8 @@ class FileViewer extends React.PureComponent<Props> {
     }
 
     this.handleAutoplay(this.props);
+    // Commented out because it would play/pause if you were typing in the comment field
+    // Need a way to check if you are typing
     // window.addEventListener('keydown', this.handleKeyDown);
   }
 
diff --git a/src/ui/component/selectChannel/view.jsx b/src/ui/component/selectChannel/view.jsx
index b0bd6e1b1..768bd5d97 100644
--- a/src/ui/component/selectChannel/view.jsx
+++ b/src/ui/component/selectChannel/view.jsx
@@ -157,7 +157,13 @@ class ChannelSection extends React.PureComponent<Props, State> {
           <BusyIndicator message="Updating channels" />
         ) : (
           <fieldset-section>
-            <FormField name="channel" type="select" onChange={this.handleChannelChange} value={channel}>
+            <FormField
+              name="channel"
+              label={__('Channel')}
+              type="select"
+              onChange={this.handleChannelChange}
+              value={channel}
+            >
               <option value={CHANNEL_ANONYMOUS}>{__('Anonymous')}</option>
               {channels.map(({ name }) => (
                 <option key={name} value={name}>
diff --git a/src/ui/page/file/view.jsx b/src/ui/page/file/view.jsx
index e4590a757..ab36e7b38 100644
--- a/src/ui/page/file/view.jsx
+++ b/src/ui/page/file/view.jsx
@@ -287,9 +287,8 @@ class FilePage extends React.Component<Props> {
           </div>
           <div className="media__info--large">
             <FileDetails uri={uri} />
-            <header className="card__header">
-              <h2 className="card__header">Comments</h2>
-            </header>
+
+            <div className="media__info-title">{__('Comments')}</div>
             <CommentCreate uri={uri} />
             <CommentsList uri={uri} />
           </div>
diff --git a/src/ui/redux/actions/app.js b/src/ui/redux/actions/app.js
index a3b58135d..7be2c2f73 100644
--- a/src/ui/redux/actions/app.js
+++ b/src/ui/redux/actions/app.js
@@ -373,7 +373,7 @@ export function doChangeVolume(volume) {
     });
   };
 }
-// HERE
+
 export function doClickCommentButton() {
   return {
     type: ACTIONS.ADD_COMMENT,
diff --git a/src/ui/redux/reducers/app.js b/src/ui/redux/reducers/app.js
index a08a19e24..04f81e434 100644
--- a/src/ui/redux/reducers/app.js
+++ b/src/ui/redux/reducers/app.js
@@ -195,7 +195,6 @@ reducers[ACTIONS.CLEAR_UPGRADE_TIMER] = state =>
   Object.assign({}, state, {
     checkUpgradeTimer: undefined,
   });
-// HERE
 
 reducers[ACTIONS.ADD_COMMENT] = state =>
   Object.assign({}, state, {
diff --git a/src/ui/scss/component/_card.scss b/src/ui/scss/component/_card.scss
index 65b523b87..e22e168d9 100644
--- a/src/ui/scss/component/_card.scss
+++ b/src/ui/scss/component/_card.scss
@@ -25,10 +25,6 @@
 .card--section {
   position: relative;
   padding: var(--spacing-large);
-
-  .card__content:not(:last-of-type) {
-    margin-bottom: var(--spacing-large);
-  }
 }
 
 .card--space-between {
@@ -100,6 +96,10 @@
 //  C O N T E N T
 
 .card__content {
+  &:not(:last-of-type) {
+    margin-bottom: var(--spacing-medium);
+  }
+
   p:not(:last-child) {
     margin-bottom: var(--spacing-medium);
   }
diff --git a/src/ui/scss/component/_comments.scss b/src/ui/scss/component/_comments.scss
index 7f7c65367..80f8f2ca8 100644
--- a/src/ui/scss/component/_comments.scss
+++ b/src/ui/scss/component/_comments.scss
@@ -1,16 +1,9 @@
+.comments {
+  margin-top: var(--spacing-large);
+}
+
 .comment {
-  padding-bottom: var(--spacing-vertical-large);
-
-  &.reply {
-    border-left: 3px solid var(--lbry-teal-5);
-    padding-left: var(--spacing-vertical-large);
-    position: relative;
-    top: -1px;
-  }
-
-  &:not(:first-of-type) {
-    padding-top: var(--spacing-vertical-large);
-  }
+  padding: var(--spacing-medium) 0;
 
   &:not(:last-of-type) {
     border-bottom: 1px solid var(--lbry-gray-1);
@@ -21,44 +14,39 @@
   }
 }
 
-.comment__actions-wrap {
-  align-items: center;
-  display: flex;
-  justify-content: space-between;
-  width: 4.5rem;
-}
+// .comment__actions-wrap {
+//   align-items: center;
+//   display: flex;
+//   justify-content: space-between;
+//   width: 4.5rem;
+// }
 
-.comment__action {
-  @include hide-text;
-  width: 0; height: 0;
-  transition: border-color 0.2s;
+// .comment__action {
+//   @include hide-text;
+//   width: 0;
+//   height: 0;
+//   transition: border-color 0.2s;
 
-  &.downvote {
-    border-top: 2rem solid var(--lbry-orange-3);
-    border-right: 1rem solid transparent;
-    border-left: 1rem solid transparent;
+//   &.downvote {
+//     border-top: 2rem solid var(--lbry-orange-3);
+//     border-right: 1rem solid transparent;
+//     border-left: 1rem solid transparent;
 
-    &:hover {
-      border-top-color: var(--lbry-yellow-3);
-    }
-  }
+//     &:hover {
+//       border-top-color: var(--lbry-yellow-3);
+//     }
+//   }
 
-  &.upvote {
-    border-right: 1rem solid transparent;
-    border-bottom: 2rem solid var(--lbry-teal-4);
-    border-left: 1rem solid transparent;
+//   &.upvote {
+//     border-right: 1rem solid transparent;
+//     border-bottom: 2rem solid var(--lbry-teal-4);
+//     border-left: 1rem solid transparent;
 
-    &:hover {
-      border-bottom-color: var(--lbry-green-2);
-    }
-  }
-}
-
-.comment__content {
-  font-size: 1.15rem;
-  padding-top: var(--spacing-vertical-medium);
-  padding-bottom: var(--spacing-vertical-large);
-}
+//     &:hover {
+//       border-bottom-color: var(--lbry-green-2);
+//     }
+//   }
+// }
 
 .comment__meta {
   time {
diff --git a/src/ui/util/use-persisted-state.js b/src/ui/util/use-persisted-state.js
index 6e67db732..c0fb2a1a9 100644
--- a/src/ui/util/use-persisted-state.js
+++ b/src/ui/util/use-persisted-state.js
@@ -4,7 +4,12 @@ export default function usePersistedState(key, firstTimeDefault) {
   // If no key is passed in, act as a normal `useState`
   let defaultValue;
   if (key) {
-    defaultValue = localStorage.getItem(key);
+    const item = localStorage.getItem(key);
+    if (item === 'true') {
+      defaultValue = true;
+    } else if (item === 'false') {
+      defaultValue = false;
+    }
   }
 
   if (!defaultValue) {
diff --git a/static/locales/en.json b/static/locales/en.json
index d884dab65..ed603704b 100644
--- a/static/locales/en.json
+++ b/static/locales/en.json
@@ -311,6 +311,10 @@
   "Uh oh. The flux in our Retro Encabulator must be out of whack. Try refreshing to fix it.": "Uh oh. The flux in our Retro Encabulator must be out of whack. Try refreshing to fix it.",
   "If you still have issues, your anti-virus software or firewall may be preventing startup.": "If you still have issues, your anti-virus software or firewall may be preventing startup.",
   "Reach out to hello@lbry.com for help, or check out": "Reach out to hello@lbry.com for help, or check out",
-  "Got it!": "Got it!"
-}
->>>>>>> comments cleanup
+  "Got it!": "Got it!",
+  "URI does not include name.": "URI does not include name.",
+  "Invalid claim ID %s.": "Invalid claim ID %s.",
+  "Comment": "Comment",
+  "Channel": "Channel",
+  "Comments": "Comments"
+}>>>>>>> comments cleanup