diff --git a/app/controllers/api/v1/timelines/group_collection_controller.rb b/app/controllers/api/v1/timelines/group_collection_controller.rb
index 4ac4d955..27ac50c6 100644
--- a/app/controllers/api/v1/timelines/group_collection_controller.rb
+++ b/app/controllers/api/v1/timelines/group_collection_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Api::V1::Timelines::GroupCollectionController < EmptyController
+class Api::V1::Timelines::GroupCollectionController < Api::BaseController
   before_action :set_collection_type
   before_action :set_sort_type
   before_action :set_statuses
@@ -10,10 +10,10 @@ class Api::V1::Timelines::GroupCollectionController < EmptyController
   }
 
   def show
-    if current_user
+    if current_account
       render json: @statuses,
         each_serializer: REST::StatusSerializer,
-        relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id)
+        relationships: StatusRelationshipsPresenter.new(@statuses, current_account.id)
     else
       render json: @statuses, each_serializer: REST::StatusSerializer
     end
@@ -64,12 +64,10 @@ class Api::V1::Timelines::GroupCollectionController < EmptyController
     @groupIds = []
     if @collection_type == 'featured'
       @groupIds = FetchGroupsService.new.call("featured")
-    elsif @collection_type == 'member' && !current_user.nil?
-      @groupIds = current_user.account.groups.pluck(:id)
-    else
-      return []
+    elsif @collection_type == 'member' && !current_account.nil?
+      @groupIds = current_account.groups.pluck(:id)
     end
-
+  
     if current_account
       SortingQueryBuilder.new.call(@sort_type, params[:max_id], @groupIds).reject { |status| FeedManager.instance.filter?(:home, status, current_account.id) }
     else
diff --git a/app/javascript/gabsocial/features/compose/components/compose_form.js b/app/javascript/gabsocial/features/compose/components/compose_form.js
index 9d5d43e7..8182c663 100644
--- a/app/javascript/gabsocial/features/compose/components/compose_form.js
+++ b/app/javascript/gabsocial/features/compose/components/compose_form.js
@@ -286,12 +286,6 @@ class ComposeForm extends ImmutablePureComponent {
           <ComposeDestinationHeader formLocation={formLocation} account={account} isModal={isModalOpen} />
 
           <div className={containerClasses} ref={this.setForm} onClick={this.handleClick}>
-            {
-              !!reduxReplyToId && isModalOpen && isMatch &&
-              <div className={[_s.d, _s.px15, _s.py10, _s.mt5].join(' ')}>
-                <StatusContainer contextType='compose' id={reduxReplyToId} isChild />
-              </div>
-            }
 
             {
               !!spoiler &&
@@ -325,6 +319,13 @@ class ComposeForm extends ImmutablePureComponent {
               </div>
             }
 
+            {
+              !!reduxReplyToId && isModalOpen && isMatch &&
+              <div className={[_s.d, _s.px15, _s.py10, _s.mt5].join(' ')}>
+                <StatusContainer contextType='compose' id={reduxReplyToId} isChild />
+              </div>
+            }
+            
             {
               !!quoteOfId && isModalOpen && isMatch &&
               <div className={[_s.d, _s.px15, _s.py10, _s.mt5].join(' ')}>
diff --git a/app/javascript/gabsocial/features/messages/components/chat_conversation_request_approve_bar.js b/app/javascript/gabsocial/features/messages/components/chat_conversation_request_approve_bar.js
index 38d25866..e6681d6e 100644
--- a/app/javascript/gabsocial/features/messages/components/chat_conversation_request_approve_bar.js
+++ b/app/javascript/gabsocial/features/messages/components/chat_conversation_request_approve_bar.js
@@ -20,8 +20,8 @@ class ChatConversationRequestApproveBar extends React.PureComponent {
   }
 
   render () {
-    if (!chatConversationId) return null
-    
+    if (!this.props.chatConversationId) return null
+
     return (
       <div className={[_s.d, _s.z4, _s.minH53PX, _s.w100PC].join(' ')}>
         <div className={[_s.d, _s.minH53PX, _s.bgNavigation, _s.aiCenter, _s.z3, _s.bottom0, _s.right0, _s.left0, _s.posFixed].join(' ')} >