diff --git a/src/components/Feed/FeedComments.jsx b/src/components/Feed/FeedComments.jsx
index cab9148a7..6f47bfa52 100644
--- a/src/components/Feed/FeedComments.jsx
+++ b/src/components/Feed/FeedComments.jsx
@@ -373,16 +373,6 @@ class FeedComments extends React.Component {
         <MediaQuery minWidth={SCREEN_BREAKPOINT_MD}>
           {(matches) => (matches ? (
             <div>
-              <div styleName="comments">
-                {commentRows}
-                {hasMoreComments &&
-                  <div styleName="load-more" key="load-more">
-                    <a href="javascript:" onClick={ handleLoadMoreClick } styleName="load-btn">
-                      {isLoadingComments ? 'Loading...' : 'load earlier posts'}
-                    </a>
-                  </div>
-                }
-              </div>
               {allowComments &&
                 <div styleName="add-comment" key="add-comment">
                   <AddComment
@@ -398,6 +388,16 @@ class FeedComments extends React.Component {
                   />
                 </div>
               }
+              <div styleName="comments">
+                {commentRows}
+                {hasMoreComments &&
+                  <div styleName="load-more" key="load-more">
+                    <a href="javascript:" onClick={ handleLoadMoreClick } styleName="load-btn">
+                      {isLoadingComments ? 'Loading...' : 'load earlier posts'}
+                    </a>
+                  </div>
+                }
+              </div>
             </div>
           ) : (
             <div>
diff --git a/src/components/Feed/FeedComments.scss b/src/components/Feed/FeedComments.scss
index 66c4cfda7..1b3498fa9 100644
--- a/src/components/Feed/FeedComments.scss
+++ b/src/components/Feed/FeedComments.scss
@@ -21,7 +21,6 @@
 
   &.is-fullscreen {
     border-radius: 0;
-    padding-bottom: 62px;
   }
 }
 
@@ -158,27 +157,6 @@
 .add-comment {
   background-color: $tc-gray-neutral-light;
   border-radius: 0 0 $card-border-radius $card-border-radius;
-
-  .is-fullscreen & {
-    border-top: 1px solid $tc-gray-10;
-    bottom: 0;
-    position: fixed;
-    right: 0;
-    /* minus sidebar width and minus sidebar border width */
-    width: calc(100% - 360px - 1px);
-    z-index: 5;
-
-    /* if there is not enough space for sidebar to be 360
-       than it becomes 1/3 of the width */
-    @media screen and (min-width: $screen-md) and (max-width: 360px * 3) {
-      /* two third of the width minus 1px of the width of the sidebar */
-      width: calc(100% / 3 * 2 - 1px);
-    }
-
-    @media screen and (max-width: $screen-md - 1px) {
-      width: 100%;
-    }
-  }
 }
 
 .no-comments {
diff --git a/src/components/TeamManagement/TopcoderManagementDialog.js b/src/components/TeamManagement/TopcoderManagementDialog.js
index f0a65ea55..d40c161f3 100644
--- a/src/components/TeamManagement/TopcoderManagementDialog.js
+++ b/src/components/TeamManagement/TopcoderManagementDialog.js
@@ -173,7 +173,7 @@ class TopcoderManagementDialog extends React.Component {
               const lastName = _.get(member, 'lastName', '')
               let userFullName = `${firstName} ${lastName}`
               userFullName = userFullName.trim().length > 0 ? userFullName : 'Connect user'
-              const role = _.find(this.roles, r => r.value === member.role).title
+              const role = _.get(_.find(this.roles, r => r.value === member.role), 'title')
               return (
                 <div
                   key={i}