diff --git a/app/templates/components/forms/group/group-settings-form.hbs b/app/templates/components/forms/group/group-settings-form.hbs
index e93ee8bddd6..959e2f2e94c 100644
--- a/app/templates/components/forms/group/group-settings-form.hbs
+++ b/app/templates/components/forms/group/group-settings-form.hbs
@@ -10,6 +10,12 @@
   </div>
 
   <form class="ui form {{if this.isLoading 'loading'}}" >
+    <div class="field mt-4">
+      <label>{{t 'About'}}</label>
+      <Widgets::Forms::RichTextEditor
+        @value={{@group.about}}
+        @name="description" />
+    </div>
     <div class="fields">
       <div class="fifteen wide field">
         <Widgets::Forms::ImageUpload
diff --git a/app/templates/components/forms/group/group-view.hbs b/app/templates/components/forms/group/group-view.hbs
index 7dd80bb7ecb..c74a05390a6 100644
--- a/app/templates/components/forms/group/group-view.hbs
+++ b/app/templates/components/forms/group/group-view.hbs
@@ -33,6 +33,13 @@
             {{/if}}
         {{/each}}
       </div>
+      {{#if @group.about}}
+        <br>
+        <div class="description">
+          {{sanitize @group.about}}
+        </div>
+        <br>
+      {{/if}}
       {{#if this.upcomingEvents}}
         <h2 class="main-heading mb-4">{{t 'Upcoming Events'}}</h2>
         <div class="ui stackable three column grid">
@@ -40,6 +47,22 @@
             <EventCard @event={{event}} @shareEvent={{action "shareEvent"}} />
           {{/each}}
         </div>
+        {{#if this.upcomingEvents}}
+          <h2 class="main-heading mb-4">{{t 'Upcoming Events'}}</h2>
+          <div class="ui stackable three column grid">
+            {{#each this.upcomingEvents as |event|}}
+              <EventCard @event={{event}} @shareEvent={{action "shareEvent"}} />
+            {{/each}}
+          </div>
+        {{/if}}
+        {{#if this.pastEvents}}
+          <h2 class="main-heading mb-4">{{t 'Past Events'}}</h2>
+          <div class="ui stackable three column grid">
+            {{#each this.pastEvents as |event|}}
+              <EventCard @event={{event}} @shareEvent={{action "shareEvent"}} />
+            {{/each}}
+          </div>
+        {{/if}}
       {{/if}}
       {{#if this.pastEvents}}
         <h2 class="main-heading mb-4">{{t 'Past Events'}}</h2>
diff --git a/app/templates/components/group-card.hbs b/app/templates/components/group-card.hbs
index d4fb5e5358c..34d1aa3d4ea 100644
--- a/app/templates/components/group-card.hbs
+++ b/app/templates/components/group-card.hbs
@@ -12,6 +12,9 @@
         <div class="header mb-1">
           <a href={{href-to 'groups.view' @group.id}} class="black-text">{{@group.name}}</a>
         </div>
+        <div class="meta mb-2">
+          {{@group.about}}
+        </div>
         {{#if (not @followedGroups)}}
           <LinkTo @route="groups.team" @model={{@group.id}}>
             <UiPopup @content={{t "Manage"}} @class="ml-2 ui circular icon button compact blue" @position="left center">
@@ -26,15 +29,6 @@
           <button class="ml-2 ui circular icon button compact red" {{action (confirm (t "Are you sure you would like to delete this group?") (action @deleteGroup @group.id))}}><i class="trash icon"></i></button>
         {{/if}}
       </div>
-      <div class="meta">
-        <span class="time">
-            {{general-date @group.modifieddAt 'date-time-short'}}
-        </span>
-        <br>
-        {{#each @group.events as |event|}}
-          <a href="{{event.url}}" target="_blank" rel="noopener"  class="ui blue basic compact button">{{event.name}} </a>
-        {{/each}}
-      </div>
     </div>
   </div>
 </div>