diff --git a/packages/frontend/src/embed/EmbedViewer.vue b/packages/frontend/src/embed/EmbedViewer.vue
index f194044a9..66e606fe3 100644
--- a/packages/frontend/src/embed/EmbedViewer.vue
+++ b/packages/frontend/src/embed/EmbedViewer.vue
@@ -259,12 +259,9 @@ body::-webkit-scrollbar {
   .spinning-icon {
     animation: spinner-spin 0.5s linear infinite;
   }
-<<<<<<< HEAD
 }
 .no-mouse {
   pointer-events: none;
-=======
->>>>>>> main
 }
 .mouse {
   pointer-events: auto;
diff --git a/packages/frontend/src/embed/EmbedViewerCore.vue b/packages/frontend/src/embed/EmbedViewerCore.vue
index b4ae2515c..1df418ce2 100644
--- a/packages/frontend/src/embed/EmbedViewerCore.vue
+++ b/packages/frontend/src/embed/EmbedViewerCore.vue
@@ -218,11 +218,7 @@ export default Vue.extend({
 
     top: 0;
     left: 0;
-<<<<<<< HEAD
     z-index: 1;
-=======
-    z-index: 10;
->>>>>>> main
   }
 
   .no-scrollbar {
diff --git a/packages/frontend/src/main/components/common/GlobalToast.vue b/packages/frontend/src/main/components/common/GlobalToast.vue
index a9d9d22fe..dc4228c75 100644
--- a/packages/frontend/src/main/components/common/GlobalToast.vue
+++ b/packages/frontend/src/main/components/common/GlobalToast.vue
@@ -1,8 +1,8 @@
 <template>
-  <v-snackbar v-model="snack" app bottom color="primary">
+  <v-snackbar v-model="snack" app bottom color="primary" timeout="10000">
     {{ text }}
     <template #action="{}">
-      <v-btn v-if="actionName" :to="to" @click="snack = false">
+      <v-btn v-if="actionName" :to="to" small @click="snack = false">
         {{ actionName }}
       </v-btn>
       <v-btn small icon @click="snack = false">
diff --git a/packages/frontend/src/main/dialogs/CommitEdit.vue b/packages/frontend/src/main/dialogs/CommitEdit.vue
index 3e58fda27..ac749814e 100644
--- a/packages/frontend/src/main/dialogs/CommitEdit.vue
+++ b/packages/frontend/src/main/dialogs/CommitEdit.vue
@@ -17,7 +17,7 @@
           <v-row>
             <v-col cols="12" class="pb-0">
               <v-text-field
-                v-model="commit.message"
+                v-model="message"
                 label="Message"
                 :rules="nameRules"
                 required
@@ -25,7 +25,7 @@
               ></v-text-field>
               <p>Move this commit to a different branch:</p>
               <v-select
-                v-model="commit.branchName"
+                v-model="newBranch"
                 filled
                 rounded
                 dense
@@ -33,7 +33,6 @@
                 :items="branchNames"
                 prepend-icon="mdi-source-branch"
                 class="pb-5"
-                @change="setNewBranchName"
               />
             </v-col>
           </v-row>
@@ -105,7 +104,8 @@ export default {
       showDeleteDialog: false,
       localBranches: [],
       branchCursor: null,
-      newBranch: null,
+      newBranch: this.stream.commit.branchName,
+      message: this.stream.commit.message,
       loading: false,
       commitIdConfirmation: '',
       commit: this.stream.commit,
@@ -126,35 +126,54 @@ export default {
     await this.fetchBranches()
   },
   methods: {
-    setNewBranchName(newBranch) {
-      this.newBranch = newBranch
-    },
     async editCommit() {
-      console.log(this.commit.branch)
       this.$mixpanel.track('Commit Action', { type: 'action', name: 'update' })
       this.loading = true
-      try {
-        await this.$apollo.mutate({
-          mutation: gql`
-            mutation commitUpdate($myCommit: CommitUpdateInput!) {
-              commitUpdate(commit: $myCommit)
-            }
-          `,
-          variables: {
-            myCommit: {
-              streamId: this.stream.id,
-              id: this.commit.id,
-              message: this.commit.message,
-              newBranchName: this.newBranch
-            }
+      const myCommit = {
+        streamId: this.stream.id,
+        id: this.commit.id
+      }
+
+      let messageChanged = false
+      let branchChanged = false
+
+      if (this.commit.message !== this.message) {
+        messageChanged = true
+        myCommit.message = this.message
+      }
+
+      if (this.commit.branchName !== this.newBranch) {
+        branchChanged = true
+        myCommit.newBranchName = this.newBranch
+      }
+
+      if (messageChanged || branchChanged)
+        try {
+          await this.$apollo.mutate({
+            mutation: gql`
+              mutation commitUpdate($myCommit: CommitUpdateInput!) {
+                commitUpdate(commit: $myCommit)
+              }
+            `,
+            variables: { myCommit }
+          })
+        } catch (err) {
+          this.$eventHub.$emit('notification', {
+            text: err.message
+          })
+        }
+      this.loading = false
+      this.commit.message = this.message
+      this.commit.branchName = this.newBranch
+      if (branchChanged) {
+        this.$eventHub.$emit('notification', {
+          text: `Commit moved to branch ${this.newBranch}.`,
+          action: {
+            name: 'View Branch',
+            to: `/streams/${this.$route.params.streamId}/branches/${this.newBranch}`
           }
         })
-      } catch (err) {
-        this.$eventHub.$emit('notification', {
-          text: err.message
-        })
       }
-      this.loading = false
       this.$emit('close')
     },
     async deleteCommit() {
@@ -196,7 +215,7 @@ export default {
           query Stream($streamId: String!, $cursor: String) {
             stream(id: $streamId) {
               id
-              branches(limit: 10, cursor: $cursor) {
+              branches(limit: 100, cursor: $cursor) {
                 totalCount
                 cursor
                 items {
diff --git a/packages/frontend/src/main/navigation/StreamNav.vue b/packages/frontend/src/main/navigation/StreamNav.vue
index 1c34adda6..047e3d4d3 100644
--- a/packages/frontend/src/main/navigation/StreamNav.vue
+++ b/packages/frontend/src/main/navigation/StreamNav.vue
@@ -215,7 +215,7 @@
     >
       <new-branch
         @close="newBranchDialog = false"
-        @refetch-branches="$apollo.queries.branchQuery.refetch()"
+        @refetch-branches="refetchBranches()"
       />
     </v-dialog>
   </portal>
@@ -327,7 +327,7 @@ export default {
           query Stream($streamId: String!, $cursor: String) {
             stream(id: $streamId) {
               id
-              branches(limit: 10, cursor: $cursor) {
+              branches(limit: 100, cursor: $cursor) {
                 totalCount
                 cursor
                 items {
diff --git a/packages/server/modules/core/graph/resolvers/commits.js b/packages/server/modules/core/graph/resolvers/commits.js
index e19471118..59e248f1a 100644
--- a/packages/server/modules/core/graph/resolvers/commits.js
+++ b/packages/server/modules/core/graph/resolvers/commits.js
@@ -141,7 +141,7 @@ module.exports = {
     },
 
     async commitUpdate(parent, args, context) {
-      await authorizeResolver(
+      const role = await authorizeResolver(
         context.userId,
         args.commit.streamId,
         'stream:contributor'
@@ -155,8 +155,10 @@ module.exports = {
         id: args.commit.id
       })
 
-      if (commit.authorId !== context.userId)
-        throw new ForbiddenError('Only the author of a commit may update it.')
+      if (commit.authorId !== context.userId || role !== 'stream:owner')
+        throw new ForbiddenError(
+          'Only the author of a commit or a stream owner may update it.'
+        )
 
       const updated = await updateCommit({ ...args.commit })
 
diff --git a/packages/server/modules/core/services/commits.js b/packages/server/modules/core/services/commits.js
index e7a92fce8..075ab4dc4 100644
--- a/packages/server/modules/core/services/commits.js
+++ b/packages/server/modules/core/services/commits.js
@@ -101,7 +101,8 @@ module.exports = {
         throw new Error('Failed to update commit branch. ')
       }
     }
-    return await Commits().where({ id }).update({ message })
+    if (message) await Commits().where({ id }).update({ message })
+    return true
   },
 
   async getCommitById({ streamId, id }) {