diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index 3633e85656..c76e1db722 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -90,15 +90,27 @@
                                 <ul v-if="telemetry.length"
                                     class="t-widget-condition-config"
                                 >
-                                    <Criterion v-for="(criterion, index) in domainObject.configuration.criteria"
-                                               :key="index"
-                                               :telemetry="telemetry"
-                                               :criterion="criterion"
-                                               :index="index"
-                                               :trigger="trigger"
-                                               :is-default="domainObject.configuration.criteria.length === 1"
-                                               @persist="persist"
-                                    />
+                                    <li v-for="(criterion, index) in domainObject.configuration.criteria"
+                                        :key="index"
+                                        class="has-local-controls t-condition"
+                                    >
+                                        <Criterion :telemetry="telemetry"
+                                                   :criterion="criterion"
+                                                   :index="index"
+                                                   :trigger="trigger"
+                                                   :is-default="domainObject.configuration.criteria.length === 1"
+                                                   @persist="persist"
+                                        />
+                                        <div class="temp">
+                                            <span class="is-enabled c-c__duplicate"
+                                                  @click="cloneCriterion"
+                                            ></span>
+                                            <span v-if="!(domainObject.configuration.criteria.length === 1)"
+                                                  class="is-enabled c-c__trash"
+                                                  @click="removeCriterion(index)"
+                                            ></span>
+                                        </div>
+                                    </li>
                                 </ul>
                                 <div class="holder c-c-button-wrapper align-left">
                                     <span class="c-c-label-spacer"></span>
@@ -180,7 +192,8 @@ export default {
             trigger: 'all',
             selectedOutputKey: '',
             stringOutputField: false,
-            outputOptions: ['false', 'true', 'string']
+            outputOptions: ['false', 'true', 'string'],
+            criterionIndex: 0
         };
     },
     computed: {
@@ -241,6 +254,14 @@ export default {
                 index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
             });
         },
+        removeCriterion(index) {
+            this.domainObject.configuration.criteria.splice(index, 1);
+            this.persist()
+        },
+        cloneCriterion(ev) {
+            // console.log('cloneCriterion')
+        },
+
         setOutput() {
             let conditionOutput = this.domainObject.configuration.output;
             if (conditionOutput) {
diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index fc52c2251a..ddc9483296 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -83,7 +83,6 @@
 import Condition from '../../condition/components/Condition.vue';
 import uuid from 'uuid';
 
-
 export default {
     inject: ['openmct', 'domainObject'],
     components: {
diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 046ca4a19e..e04803faf0 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -1,5 +1,5 @@
 <template>
-<li class="has-local-controls t-condition">
+<div>
     <label>{{ setRowLabel }}</label>
     <span class="t-configuration">
         <span class="controls">
@@ -46,17 +46,7 @@
             >
         </span>
     </span>
-    <div class="temp">
-        <span class="is-enabled c-c__duplicate"
-              @click="cloneCriterion"
-        ></span>
-        <span v-if="!isDefault"
-              class="is-enabled c-c__trash"
-              @click="removeCriterion"
-        ></span>
-    </div>
-</li>
-
+</div>
 </template>
 
 <script>
@@ -104,7 +94,6 @@ export default {
     mounted() {
         this.updateMetadataOptions();
         this.updateOperationInputVisibility();
-        console.log('this.isDefault', this.isDefault);
     },
     methods: {
         updateMetadataOptions() {
@@ -127,18 +116,6 @@ export default {
         updateMetadataSelection() {
             this.updateOperationInputVisibility();
         },
-        removeCriterion(ev) {
-            console.log('removeCriterion', this.index);
-            // this.$emit('removeCondition', this.conditionIdentifier);
-        },
-        cloneCriterion(ev) {
-            console.log('cloneCriterion')
-            // this.$emit('cloneCondition', {
-            //     identifier: this.conditionIdentifier,
-            //     index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
-            // });
-        },
-
         persist() {
             this.$emit('persist', this.criterion);
         }
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index d5503456db..76d8541cf4 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -199,7 +199,7 @@
 }
 
 .temp {
-    width: 24px;
+    width: 28px;
 
     .c-c__duplicate,
     .c-c__trash {