diff --git a/app/javascript/gabsocial/components/panel/groups_panel.js b/app/javascript/gabsocial/components/panel/groups_panel.js
index 2b79d7a1..e11c491c 100644
--- a/app/javascript/gabsocial/components/panel/groups_panel.js
+++ b/app/javascript/gabsocial/components/panel/groups_panel.js
@@ -25,7 +25,7 @@ const mapDispatchToProps = (dispatch) => ({
 export default
 @connect(mapStateToProps, mapDispatchToProps)
 @injectIntl
-class GroupSidebarPanel extends ImmutablePureComponent {
+class GroupsPanel extends ImmutablePureComponent {
 
   static propTypes = {
     groupIds: ImmutablePropTypes.list,
diff --git a/app/javascript/gabsocial/layouts/explore_layout.js b/app/javascript/gabsocial/layouts/explore_layout.js
index 5d30e5e2..e9387811 100644
--- a/app/javascript/gabsocial/layouts/explore_layout.js
+++ b/app/javascript/gabsocial/layouts/explore_layout.js
@@ -9,7 +9,7 @@ import Responsive from '../features/ui/util/responsive_component'
 import WrappedBundle from '../features/ui/util/wrapped_bundle'
 import Heading from '../components/heading'
 import {
-  GroupSidebarPanel,
+  GroupsPanel,
   SignUpLogInPanel,
   TrendsPanel,
 } from '../features/ui/util/async_components'
@@ -81,7 +81,7 @@ export default class ExploreLayout extends ImmutablePureComponent {
 
             <div className={[_s.default, _s.width100PC, _s.z1].join(' ')}>
               <div className={[_s.default, _s.mt15, _s.px10].join(' ')}>
-                <SignUpLogInPanel key='explore-page-signup-login-panel' isXS />
+                <WrappedBundle component={SignUpLogInPanel} componentParams={{ isXS: true }} />
               </div>
               {pageTitleBlock}
               {children}
@@ -109,7 +109,7 @@ export default class ExploreLayout extends ImmutablePureComponent {
                       page='explore'
                       layout={[
                         SignUpLogInPanel,
-                        <WrappedBundle component={GroupSidebarPanel} componentParams={{ groupType: 'featured' }} />,
+                        <WrappedBundle component={GroupsPanel} componentParams={{ groupType: 'featured' }} />,
                         <WrappedBundle component={TrendsPanel} componentParams={{ isLazy: true, shouldLoad: lazyLoaded }} />,
                       ]}
                     />
@@ -123,4 +123,4 @@ export default class ExploreLayout extends ImmutablePureComponent {
     )
   }
 
-}
+}
\ No newline at end of file
diff --git a/app/javascript/gabsocial/layouts/group_layout.js b/app/javascript/gabsocial/layouts/group_layout.js
index baecd77d..fe29a3fe 100644
--- a/app/javascript/gabsocial/layouts/group_layout.js
+++ b/app/javascript/gabsocial/layouts/group_layout.js
@@ -10,7 +10,7 @@ import WrappedBundle from '../features/ui/util/wrapped_bundle'
 import {
   LinkFooter,
   SignUpPanel,
-  GroupSidebarPanel,
+  GroupsPanel,
   GroupInfoPanel,
 } from '../features/ui/util/async_components'
 
@@ -52,7 +52,7 @@ export default class GroupLayout extends ImmutablePureComponent {
           <div className={[_s.default, _s.width100PC].join(' ')}>
 
             <GroupHeader group={group} relationships={relationships} isXS>
-              <GroupInfoPanel group={group} noPanel />
+              <WrappedBundle component={GroupInfoPanel} componentParams={{ group, noPanel: true }} />
             </GroupHeader>
 
             <div className={[_s.default, _s.width100PC, _s.z1].join(' ')}>
@@ -82,7 +82,7 @@ export default class GroupLayout extends ImmutablePureComponent {
                       layout={[
                         <WrappedBundle component={GroupInfoPanel} componentParams={{ group }} />,
                         SignUpPanel,
-                        GroupSidebarPanel,
+                        GroupsPanel,
                         LinkFooter,
                       ]}
                     />
diff --git a/app/javascript/gabsocial/layouts/profile_layout.js b/app/javascript/gabsocial/layouts/profile_layout.js
index 50534bf5..687c8bd0 100644
--- a/app/javascript/gabsocial/layouts/profile_layout.js
+++ b/app/javascript/gabsocial/layouts/profile_layout.js
@@ -67,9 +67,9 @@ export default class ProfileLayout extends ImmutablePureComponent {
                 <div className={[_s.default, _s.z1, _s.width100PC, _s.alignItemsCenter].join(' ')}>
 
                   <ProfileHeader account={account} isXS>
-                    <WrappedBundle component={ProfileInfoPanel} componentParams={{ account }} />
+                    <WrappedBundle component={ProfileInfoPanel} componentParams={{ account, noPanel: true }} />
                     <Divider isSmall />
-                    <WrappedBundle component={ProfileStatsPanel} componentParams={{ account }} />
+                    <WrappedBundle component={ProfileStatsPanel} componentParams={{ account, noPanel: true }} />
                   </ProfileHeader>
 
                   <div className={[_s.default, _s.width100PC, , _s.flexRow, _s.justifyContentEnd, _s.py15].join(' ')}>
diff --git a/app/javascript/gabsocial/pages/community_page.js b/app/javascript/gabsocial/pages/community_page.js
index a6aa8f3a..242174bf 100644
--- a/app/javascript/gabsocial/pages/community_page.js
+++ b/app/javascript/gabsocial/pages/community_page.js
@@ -4,7 +4,7 @@ import PageTitle from '../features/ui/util/page_title'
 import DefaultLayout from '../layouts/default_layout'
 import {
   LinkFooter,
-  GroupSidebarPanel,
+  GroupsPanel,
   ProgressPanel,
   TrendsPanel,
   WhoToFollowPanel,
@@ -50,7 +50,7 @@ class CommunityPage extends PureComponent {
           ProgressPanel,
           TrendsPanel,
           WhoToFollowPanel,
-          GroupSidebarPanel,
+          GroupsPanel,
           LinkFooter,
         ]}
       >