diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..91b69b2
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,15 @@
+{
+    "sqltools.connections": [
+        {
+            "ssh": "Disabled",
+            "previewLimit": 50,
+            "server": "mic-check-db-1",
+            "port": 5432,
+            "askForPassword": true,
+            "driver": "PostgreSQL",
+            "name": "MicCheck - local",
+            "database": "micheck",
+            "username": "micheck"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/docs/.08_testing_strategy.md.kate-swp b/docs/.08_testing_strategy.md.kate-swp
deleted file mode 100644
index 553524f..0000000
Binary files a/docs/.08_testing_strategy.md.kate-swp and /dev/null differ
diff --git a/src/admin/src/components/features/FeatureDetail.vue b/src/admin/src/components/features/FeatureDetail.vue
index 8a95687..2e40282 100644
--- a/src/admin/src/components/features/FeatureDetail.vue
+++ b/src/admin/src/components/features/FeatureDetail.vue
@@ -54,7 +54,8 @@
                 <div>
                   <p class="text-body-1 font-weight-medium mb-1">Enabled</p>
                   <p class="text-body-2 text-medium-emphasis">
-                    {{ featureState.enabled ? 'On in this environment' : 'Off in this environment' }}
+                    {{ featureState.enabled ? 'On' : 'Off' }} in
+                    <strong>{{ contextStore.currentEnvironment?.name }}</strong>
                   </p>
                 </div>
                 <v-switch
diff --git a/src/admin/src/components/segments/RuleGroupEditor.vue b/src/admin/src/components/segments/RuleGroupEditor.vue
index f0db37e..cce58df 100644
--- a/src/admin/src/components/segments/RuleGroupEditor.vue
+++ b/src/admin/src/components/segments/RuleGroupEditor.vue
@@ -12,8 +12,8 @@
         data-testid="rule-type-toggle"
         @update:model-value="onTypeChange"
       >
-        <v-btn value="AND" size="small" data-testid="rule-type-and">ALL (AND)</v-btn>
-        <v-btn value="OR" size="small" data-testid="rule-type-or">ANY (OR)</v-btn>
+        <v-btn value="All" size="small" data-testid="rule-type-and">ALL (AND)</v-btn>
+        <v-btn value="Any" size="small" data-testid="rule-type-or">ANY (OR)</v-btn>
       </v-btn-toggle>
       <v-spacer />
       <v-btn
@@ -113,7 +113,7 @@ function onAddCondition(): void {
 }
 
 function onAddChildGroup(): void {
-  const newGroup: SegmentRule = { type: 'AND', conditions: [] };
+  const newGroup: SegmentRule = { type: 'All', conditions: [] };
   const childRules = [...(props.rule.childRules ?? []), newGroup];
   emit('update:rule', { ...props.rule, childRules });
 }
diff --git a/src/admin/src/components/segments/SegmentEditor.vue b/src/admin/src/components/segments/SegmentEditor.vue
index 55c5c70..621ffd6 100644
--- a/src/admin/src/components/segments/SegmentEditor.vue
+++ b/src/admin/src/components/segments/SegmentEditor.vue
@@ -140,7 +140,7 @@ watch(() => props.modelValue, (open) => {
 watch(() => props.segment, resetForm, { immediate: true });
 
 function onAddRuleGroup(): void {
-  form.value.rules = [...form.value.rules, { type: 'AND', conditions: [] }];
+  form.value.rules = [...form.value.rules, { type: 'All', conditions: [] }];
 }
 
 function onUpdateRule(index: number, rule: SegmentRule): void {
diff --git a/src/admin/src/types/api.ts b/src/admin/src/types/api.ts
index a3f5fdf..b5a09d0 100644
--- a/src/admin/src/types/api.ts
+++ b/src/admin/src/types/api.ts
@@ -234,7 +234,7 @@ export type SegmentConditionOperator =
   | 'PercentageSplit'
   | 'ModuloValueDivisorRemainder';
 
-export type SegmentRuleType = 'AND' | 'OR';
+export type SegmentRuleType = 'All' | 'Any';
 
 export interface SegmentCondition {
   id?: number;
diff --git a/src/admin/tests/unit/components/segments/SegmentEditor.spec.ts b/src/admin/tests/unit/components/segments/SegmentEditor.spec.ts
index ed673e9..962e460 100644
--- a/src/admin/tests/unit/components/segments/SegmentEditor.spec.ts
+++ b/src/admin/tests/unit/components/segments/SegmentEditor.spec.ts
@@ -24,7 +24,7 @@ const mockSegment: SegmentResponse = {
   name: 'beta_users',
   projectId: 10,
   createdAt: '2026-01-01T00:00:00Z',
-  rules: [{ type: 'AND', conditions: [{ property: 'plan', operator: 'Equal', value: 'beta' }] }],
+  rules: [{ type: 'All', conditions: [{ property: 'plan', operator: 'Equal', value: 'beta' }] }],
 };
 
 const dialogStub = { template: '<div><slot /></div>' };
diff --git a/src/admin/tests/unit/views/SegmentsView.spec.ts b/src/admin/tests/unit/views/SegmentsView.spec.ts
index 17bd1da..3ed7f34 100644
--- a/src/admin/tests/unit/views/SegmentsView.spec.ts
+++ b/src/admin/tests/unit/views/SegmentsView.spec.ts
@@ -24,7 +24,7 @@ const dialogStub = { template: '<div><slot /></div>' };
 const mockSegments: SegmentResponse[] = [
   {
     id: 1, name: 'beta_users', projectId: 10, createdAt: '2026-01-01T00:00:00Z',
-    rules: [{ type: 'AND', conditions: [{ property: 'plan', operator: 'Equal', value: 'beta' }] }],
+    rules: [{ type: 'All', conditions: [{ property: 'plan', operator: 'Equal', value: 'beta' }] }],
   },
   {
     id: 2, name: 'power_users', projectId: 10, createdAt: '2026-01-01T00:00:00Z',