diff --git a/Taskfile.yml b/Taskfile.yml
index e23a02ff51..31d665cec8 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -69,7 +69,7 @@ tasks:
       - buf generate
 
   clean:
-    desc: Rm built assets
+    desc: Remove built assets
     cmds:
       - go clean -i {{.SOURCE_FILES}}
       - rm -rf dist/*
@@ -84,7 +84,7 @@ tasks:
       COVERAGE_FILE: coverage.txt
 
   dev:
-    desc: Start the server and ui in development modes
+    desc: Start the server and UI in development modes
     cmds:
       - modd
     preconditions:
@@ -97,13 +97,13 @@ tasks:
       - goimports -w .
 
   lint:
-    desc: Run linters
+    desc: Run the linters
     cmds:
       - golangci-lint run 2>&1
       - buf lint
 
   test:
-    desc: Run all tests
+    desc: Run all the tests
     cmds:
       - go test {{.TEST_OPTS}} -covermode=atomic -count=1 -coverprofile={{.COVERAGE_FILE}} {{.SOURCE_FILES}} -run={{.TEST_PATTERN}} -timeout=30s {{.TEST_FLAGS}}
     vars:
diff --git a/modd.conf b/modd.conf
index 32bdb83f42..c1abf0448e 100644
--- a/modd.conf
+++ b/modd.conf
@@ -1,5 +1,5 @@
-**/*.go !**/*_test.go {
-    daemon +sigterm: go run ./cmd/flipt/. --config ./config/local.yml --force-migrate
+{
+    daemon: go run ./cmd/flipt/. --config ./config/local.yml --force-migrate
 }
 {
     indir: ./ui
diff --git a/ui/src/components/Flags/Flag.vue b/ui/src/components/Flags/Flag.vue
index e332e85798..c05347018e 100644
--- a/ui/src/components/Flags/Flag.vue
+++ b/ui/src/components/Flags/Flag.vue
@@ -107,20 +107,30 @@
           >
             {{ props.row.attachment | limit }}
           </b-table-column>
-          <b-table-column v-slot="props" field="" label="" width="110" centered>
+          <b-table-column v-slot="props" field="" label="" width="160" centered>
             <a
               class="button is-white"
               @click.prevent="editVariant(props.index)"
             >
               <span class="icon is-small">
-                <i class="fas fa-pencil-alt" />
+                <i class="fas fa-pencil-alt" title="Edit" />
+              </span>
+            </a>
+            <a
+              class="button is-white"
+              @click.prevent="duplicateVariant(props.index)"
+            >
+              <span class="icon is-small">
+                <i class="far fa-clone" title="Duplicate" />
               </span>
             </a>
             <a
               class="button is-white"
               @click.prevent="deleteVariant(props.index)"
             >
-              <span class="icon is-small"> <i class="fas fa-times" /> </span>
+              <span class="icon is-small">
+                <i class="fas fa-times" title="Delete" />
+              </span>
             </a>
           </b-table-column>
         </b-table>
@@ -462,6 +472,10 @@ export default {
       this.dialogEditVariantVisible = true;
       this.selectedVariant = cloneDeep(this.flag.variants[index]);
     },
+    duplicateVariant(index) {
+      this.dialogAddVariantVisible = true;
+      this.newVariant = cloneDeep(this.flag.variants[index]);
+    },
     cancelEditVariant() {
       this.dialogEditVariantVisible = false;
       this.selectedVariant = clone(DEFAULT_VARIANT);
diff --git a/ui/src/components/Segments/Segment.vue b/ui/src/components/Segments/Segment.vue
index 865444bba4..8303fa67ff 100644
--- a/ui/src/components/Segments/Segment.vue
+++ b/ui/src/components/Segments/Segment.vue
@@ -114,20 +114,30 @@
           <b-table-column v-slot="props" field="value" label="Value">
             {{ props.row.value }}
           </b-table-column>
-          <b-table-column v-slot="props" field="" label="" width="110" centered>
+          <b-table-column v-slot="props" field="" label="" width="160" centered>
             <a
               class="button is-white"
               @click.prevent="editConstraint(props.index)"
             >
               <span class="icon is-small">
-                <i class="fas fa-pencil-alt" />
+                <i class="fas fa-pencil-alt" title="Edit" />
+              </span>
+            </a>
+            <a
+              class="button is-white"
+              @click.prevent="duplicateConstraint(props.index)"
+            >
+              <span class="icon is-small">
+                <i class="far fa-clone" title="Duplicate" />
               </span>
             </a>
             <a
               class="button is-white"
               @click.prevent="deleteConstraint(props.index)"
             >
-              <span class="icon is-small"> <i class="fas fa-times" /> </span>
+              <span class="icon is-small">
+                <i class="fas fa-times" title="Delete" />
+              </span>
             </a>
           </b-table-column>
         </b-table>
@@ -612,6 +622,10 @@ export default {
       this.dialogEditConstraintVisible = true;
       this.selectedConstraint = cloneDeep(this.segment.constraints[index]);
     },
+    duplicateConstraint(index) {
+      this.dialogAddConstraintVisible = true;
+      this.newConstraint = cloneDeep(this.segment.constraints[index]);
+    },
     cancelEditConstraint() {
       this.dialogEditConstraintVisible = false;
       this.selectedConstraint = clone(DEFAULT_CONSTRAINT);