diff --git a/src/lib/CardsHeader.svelte b/src/lib/CardsHeader.svelte
index fe09f7bc..bd2f3da5 100644
--- a/src/lib/CardsHeader.svelte
+++ b/src/lib/CardsHeader.svelte
@@ -10,7 +10,7 @@
     let avatarOpen = false;
     const toggleAvatarModal = () => (avatarOpen = !avatarOpen);
     
-    export let loading: boolean;
+    export let loading: boolean = false;
 </script>
 
     <CardTitle style="margin-top: 0px; margin-bottom: 0px; outline: none; align-items: center;" class="d-flex justify-content-between align-middle w-100">
diff --git a/src/lib/group/Body.svelte b/src/lib/group/Body.svelte
index 8c63ce2a..8da89b42 100644
--- a/src/lib/group/Body.svelte
+++ b/src/lib/group/Body.svelte
@@ -3,24 +3,38 @@
     import moment from 'moment';
     import { toHTML } from 'discord-markdown';
     import type Group from '../../api/group';
+    import Edit from './Edit.svelte';
+    import twemoji from 'twemoji';
    
-    export let group: Group;
+    export let item: Group;
+    let group = item; 
     let editMode: boolean;
     export let isPublic: boolean;
+    export let loading: boolean = false;
 
     let htmlDescription: string;
-    if (group.description) { 
+    $: if (group.description) { 
         htmlDescription = toHTML(group.description, {embed: true});
     } else {
         htmlDescription = "(no description)";
     }
+    let htmlDisplayName: string;
+    if (group.display_name) htmlDisplayName = toHTML(group.display_name)
+
+    let settings = JSON.parse(localStorage.getItem("pk-settings"));
+    let descriptionElement: any;
+    let displayNameElement: any;
+
+    $: if (settings && settings.appearance.twemoji) {
+        if (descriptionElement) twemoji.parse(descriptionElement);
+        if (displayNameElement) twemoji.parse(displayNameElement);
+    };
 
     let created = moment(group.created).format("MMM D, YYYY");
 
     let bannerOpen = false;
     const toggleBannerModal = () => (bannerOpen = !bannerOpen);
 
-    let settings = JSON.parse(localStorage.getItem("pk-settings"));
 </script>
 
 <CardBody style="border-left: 4px solid #{group.color}; margin: -1rem -1.25rem">
@@ -38,7 +52,7 @@
     {/if}
     {#if group.display_name}
     <Col xs={12} lg={4} class="mb-2">
-        <b>Display Name:</b> {group.display_name}
+        <b>Display Name:</b> <span bind:this={displayNameElement}>{@html htmlDisplayName}</span>
     </Col>
     {/if}
     {#if group.created && !isPublic}
@@ -62,7 +76,7 @@
     </Col>
     {/if}
 </Row>
-<div class="my-2 description">
+<div class="my-2 description" bind:this={descriptionElement}>
     <b>Description:</b><br />
     {@html htmlDescription}
 </div>
@@ -73,6 +87,6 @@
 <Button style="flex: 0" color="primary" on:click={() => editMode = true}>Edit</Button>
 {/if}
 {:else}
-woohoo editing goes here
+<Edit bind:loading bind:group bind:editMode />
 {/if}
 </CardBody>
\ No newline at end of file
diff --git a/src/lib/group/Edit.svelte b/src/lib/group/Edit.svelte
new file mode 100644
index 00000000..5e158aa8
--- /dev/null
+++ b/src/lib/group/Edit.svelte
@@ -0,0 +1,76 @@
+<script lang="ts">
+    import { Row, Col, Input, Button, Label, Alert } from 'sveltestrap';
+    import Group from '../../api/group';
+    import PKAPI from '../../api';
+    import autosize from 'svelte-autosize';
+
+    export let loading: boolean = false;
+    export let group: Group;
+    export let editMode: boolean;
+
+    let err: string[] = [];
+
+    let input = new Group(group);
+
+    async function submit() {
+        let data = input;
+        err = [];
+
+        if (data.color && !/^#?[A-Fa-f0-9]{6}$/.test(input.color)) {
+            err.push(`"${data.color}" is not a valid color, the color must be a 6-digit hex code. (example: #ff0000)`);
+        } else if (data.color) {
+            if (data.color.startsWith("#")) {
+                data.color = input.color.slice(1, input.color.length);
+            }
+        }
+
+        err = err;
+        if (err.length > 0) return;
+
+        loading = true;
+        const api = new PKAPI();
+        try {
+            let res = await api.patchGroup({token: localStorage.getItem("pk-token"), id: group.id, data: data});
+            group = res;
+            err = [];
+            editMode = false;
+            loading = false;
+        } catch (error) {
+            console.log(error);
+            err.push(error.message);
+            err = err;
+            loading = false;
+        }
+    }
+</script>
+
+{#each err as error}
+    <Alert color="danger">{@html error}</Alert>
+{/each}
+<Row>
+    <Col xs={12} lg={4} class="mb-2">
+        <Label>Name:</Label>
+        <Input bind:value={input.name} maxlength={100} type="text" placeholder={group.name} />
+    </Col>
+    <Col xs={12} lg={4} class="mb-2">
+        <Label>Display name:</Label>
+        <Input bind:value={input.display_name} maxlength={100} type="text" placeholder={group.display_name} />
+    </Col>
+    <Col xs={12} lg={4} class="mb-2">
+        <Label>Color:</Label>
+        <Input bind:value={input.color} type="text" placeholder={group.color}/>
+    </Col>
+    <Col xs={12} lg={4} class="mb-2">
+        <Label>Avatar url:</Label>
+        <Input bind:value={input.icon} maxlength={256} type="url" placeholder={group.icon}/>
+    </Col>
+    <Col xs={12} lg={4} class="mb-2">
+        <Label>Banner url:</Label>
+        <Input bind:value={input.banner} maxlength={256} type="url" placeholder={group.banner}/>
+    </Col>
+</Row>
+<div class="my-2">
+    <b>Description:</b><br />
+    <textarea class="form-control" bind:value={input.description} maxlength={1000} use:autosize placeholder={group.description}/>
+</div>
+<Button style="flex: 0" color="primary" on:click={submit}>Submit</Button> <Button style="flex: 0" color="light" on:click={() => editMode = false}>Back</Button>
\ No newline at end of file
diff --git a/src/lib/group/List.svelte b/src/lib/group/List.svelte
index d35e4572..bcf33037 100644
--- a/src/lib/group/List.svelte
+++ b/src/lib/group/List.svelte
@@ -13,7 +13,6 @@
     import Svelecte, { addFormatter } from 'svelecte';
 
     export let isPublic: boolean;
-    let itemLoading = false;
 
     export let list: Group[];
     export let members: Member[];
@@ -146,6 +145,8 @@
     'member-list': memberListRenderer
   });
 
+  let itemLoading: boolean[] = [];
+  $: itemLoading.length = slicedList.length;
 </script>
 
 <Card class="mb-3">
@@ -248,12 +249,12 @@
 </Row>
 <ListPagination bind:currentPage bind:pageAmount />
 <Accordion class="my-3" stayOpen>
-    {#each slicedList as group (group.id)}
+    {#each slicedList as group, index (group.id)}
         <AccordionItem>
-            <CardsHeader bind:item={group} bind:loading={itemLoading} slot="header">
+            <CardsHeader bind:item={group} bind:loading={itemLoading[index]} slot="header">
                 <FaUserCircle slot="icon"/>
             </CardsHeader>
-            <Body bind:group bind:isPublic={isPublic}/>
+            <Body bind:item={group} bind:isPublic={isPublic} bind:loading={itemLoading[index]}/>
         </AccordionItem>
     {/each}
 </Accordion>