diff --git a/frontend/components/tasks/textClassification/LabelGroup.vue b/frontend/components/tasks/textClassification/LabelGroup.vue
new file mode 100644
index 00000000..cc6dbbee
--- /dev/null
+++ b/frontend/components/tasks/textClassification/LabelGroup.vue
@@ -0,0 +1,46 @@
+<template>
+  <label-group-single
+    v-if="singleLabel"
+    :annotations="annotations"
+    :labels="labels"
+    @add="$emit('add', $event)"
+    @remove="$emit('remove', $event)"
+  />
+  <label-group-multi
+    v-else
+    :annotations="annotations"
+    :labels="labels"
+    @add="$emit('add', $event)"
+    @remove="$emit('remove', $event)"
+  />
+</template>
+
+<script>
+import LabelGroupSingle from './singleLabel/LabelGroup.vue'
+import LabelGroupMulti from './multiLabel/LabelGroup.vue'
+
+export default {
+  components: {
+    LabelGroupSingle,
+    LabelGroupMulti
+  },
+
+  props: {
+    labels: {
+      type: Array,
+      default: () => [],
+      required: true
+    },
+    annotations: {
+      type: Array,
+      default: () => ([]),
+      required: true
+    },
+    singleLabel: {
+      type: Boolean,
+      default: false,
+      required: true
+    }
+  }
+}
+</script>
diff --git a/frontend/components/tasks/textClassification/LabelSelect.vue b/frontend/components/tasks/textClassification/LabelSelect.vue
new file mode 100644
index 00000000..0a70cda1
--- /dev/null
+++ b/frontend/components/tasks/textClassification/LabelSelect.vue
@@ -0,0 +1,46 @@
+<template>
+  <label-select-single
+    v-if="singleLabel"
+    :annotations="annotations"
+    :labels="labels"
+    @add="$emit('add', $event)"
+    @remove="$emit('remove', $event)"
+  />
+  <label-select-multi
+    v-else
+    :annotations="annotations"
+    :labels="labels"
+    @add="$emit('add', $event)"
+    @remove="$emit('remove', $event)"
+  />
+</template>
+
+<script>
+import LabelSelectSingle from './singleLabel/LabelSelect.vue'
+import LabelSelectMulti from './multiLabel/LabelSelect.vue'
+
+export default {
+  components: {
+    LabelSelectSingle,
+    LabelSelectMulti
+  },
+
+  props: {
+    labels: {
+      type: Array,
+      default: () => [],
+      required: true
+    },
+    annotations: {
+      type: Array,
+      default: () => ([]),
+      required: true
+    },
+    singleLabel: {
+      type: Boolean,
+      default: false,
+      required: true
+    }
+  }
+}
+</script>
diff --git a/frontend/components/tasks/textClassification/multiLabel/LabelGroup.vue b/frontend/components/tasks/textClassification/multiLabel/LabelGroup.vue
new file mode 100644
index 00000000..1a0bcdae
--- /dev/null
+++ b/frontend/components/tasks/textClassification/multiLabel/LabelGroup.vue
@@ -0,0 +1,74 @@
+<template>
+  <v-chip-group
+    :value="annotatedLabel"
+    column
+    multiple
+    @change="addOrRemove"
+  >
+    <v-chip
+      v-for="item in labels"
+      :key="item.id"
+      :color="item.backgroundColor"
+      filter
+      :text-color="$contrastColor(item.backgroundColor)"
+    >
+      {{ item.text }}
+      <v-avatar
+        right
+        color="white"
+        class="black--text font-weight-bold"
+      >
+        {{ item.suffixKey }}
+      </v-avatar>
+    </v-chip>
+  </v-chip-group>
+</template>
+
+<script>
+import _ from 'lodash'
+
+export default {
+  props: {
+    labels: {
+      type: Array,
+      default: () => [],
+      required: true
+    },
+    annotations: {
+      type: Array,
+      default: () => ([]),
+      required: true
+    }
+  },
+
+  computed: {
+    annotatedLabel() {
+      const labelIds = this.annotations.map(item => item.label)
+      return labelIds.map(id => this.labels.findIndex(item => item.id === id))
+    }
+  },
+
+  methods: {
+    addOrRemove(indexes) {
+      if (indexes.length > this.annotatedLabel.length) {
+        const index = _.difference(indexes, this.annotatedLabel)
+        const label = this.labels[index]
+        this.add(label)
+      } else {
+        const index = _.difference(this.annotatedLabel, indexes)
+        const label = this.labels[index]
+        this.remove(label)
+      }
+    },
+
+    add(label) {
+      this.$emit('add', label.id)
+    },
+
+    remove(label) {
+      const annotation = this.annotations.find(item => item.label === label.id)
+      this.$emit('remove', annotation.id)
+    }
+  }
+}
+</script>
diff --git a/frontend/components/tasks/textClassification/TextClassification.vue b/frontend/components/tasks/textClassification/multiLabel/LabelSelect.vue
similarity index 98%
rename from frontend/components/tasks/textClassification/TextClassification.vue
rename to frontend/components/tasks/textClassification/multiLabel/LabelSelect.vue
index 87d5b548..73386c4d 100644
--- a/frontend/components/tasks/textClassification/TextClassification.vue
+++ b/frontend/components/tasks/textClassification/multiLabel/LabelSelect.vue
@@ -1,12 +1,13 @@
 <template>
   <v-combobox
     v-model="annotatedLabels"
+    chips
     :items="labels"
     item-text="text"
-    :label="$t('labels.labels')"
+    hide-details
     hide-selected
-    chips
     multiple
+    class="pt-0"
     :search-input.sync="search"
     @change="search=''"
   >
diff --git a/frontend/components/tasks/textClassification/singleLabel/LabelGroup.vue b/frontend/components/tasks/textClassification/singleLabel/LabelGroup.vue
new file mode 100644
index 00000000..d450147b
--- /dev/null
+++ b/frontend/components/tasks/textClassification/singleLabel/LabelGroup.vue
@@ -0,0 +1,69 @@
+<template>
+  <v-chip-group
+    :value="annotatedLabel"
+    column
+    @change="addOrRemove"
+  >
+    <v-chip
+      v-for="item in labels"
+      :key="item.id"
+      :color="item.backgroundColor"
+      filter
+      :text-color="$contrastColor(item.backgroundColor)"
+    >
+      {{ item.text }}
+      <v-avatar
+        right
+        color="white"
+        class="black--text font-weight-bold"
+      >
+        {{ item.suffixKey }}
+      </v-avatar>
+    </v-chip>
+  </v-chip-group>
+</template>
+
+<script>
+export default {
+  props: {
+    labels: {
+      type: Array,
+      default: () => [],
+      required: true
+    },
+    annotations: {
+      type: Array,
+      default: () => ([]),
+      required: true
+    }
+  },
+
+  computed: {
+    annotatedLabel() {
+      const labelIds = this.annotations.map(item => item.label)
+      return this.labels.findIndex(item => labelIds.includes(item.id))
+    }
+  },
+
+  methods: {
+    addOrRemove(index) {
+      if (index === undefined) {
+        const label = this.labels[this.annotatedLabel]
+        this.remove(label)
+      } else {
+        const label = this.labels[index]
+        this.add(label)
+      }
+    },
+
+    add(label) {
+      this.$emit('add', label.id)
+    },
+
+    remove(label) {
+      const annotation = this.annotations.find(item => item.label === label.id)
+      this.$emit('remove', annotation.id)
+    }
+  }
+}
+</script>
diff --git a/frontend/components/tasks/textClassification/SingleLabel.vue b/frontend/components/tasks/textClassification/singleLabel/LabelSelect.vue
similarity index 98%
rename from frontend/components/tasks/textClassification/SingleLabel.vue
rename to frontend/components/tasks/textClassification/singleLabel/LabelSelect.vue
index 387b2999..f0daa330 100644
--- a/frontend/components/tasks/textClassification/SingleLabel.vue
+++ b/frontend/components/tasks/textClassification/singleLabel/LabelSelect.vue
@@ -1,12 +1,13 @@
 <template>
   <v-select
     :value="annotatedLabel"
+    chips
     :items="labels"
     item-text="text"
-    :label="$t('labels.labels')"
+    hide-details
     hide-selected
     return-object
-    chips
+    class="pt-0"
     @change="addOrRemove"
   >
     <template v-slot:selection="{ attrs, item, select, selected }">
diff --git a/frontend/components/tasks/toolbar/ToolbarLaptop.vue b/frontend/components/tasks/toolbar/ToolbarLaptop.vue
index 390c9800..265fc331 100644
--- a/frontend/components/tasks/toolbar/ToolbarLaptop.vue
+++ b/frontend/components/tasks/toolbar/ToolbarLaptop.vue
@@ -59,6 +59,7 @@
           />
         </v-dialog>
       </v-btn-toggle>
+      <slot />
       <v-spacer />
       <button-pagination
         :value="page"
diff --git a/frontend/pages/demo/sentiment-analysis/index.vue b/frontend/pages/demo/sentiment-analysis/index.vue
index 9673c9eb..885fc81b 100644
--- a/frontend/pages/demo/sentiment-analysis/index.vue
+++ b/frontend/pages/demo/sentiment-analysis/index.vue
@@ -5,13 +5,15 @@
         <v-col cols="12" md="9">
           <v-card>
             <v-card-title>
-              <text-classification
+              <label-group
                 :labels="items"
                 :annotations="currentDoc.annotations"
+                single-label="true"
                 @add="addLabel"
                 @remove="removeLabel"
               />
             </v-card-title>
+            <v-divider />
             <v-card-text class="title">
               {{ currentDoc.text }}
             </v-card-text>
@@ -27,13 +29,13 @@
 
 <script>
 import ListMetadata from '@/components/tasks/metadata/ListMetadata'
-import TextClassification from '@/components/tasks/textClassification/TextClassification'
+import LabelGroup from '@/components/tasks/textClassification/LabelGroup'
 
 export default {
   layout: 'demo',
 
   components: {
-    TextClassification,
+    LabelGroup,
     ListMetadata
   },
 
diff --git a/frontend/pages/projects/_id/text-classification/index.vue b/frontend/pages/projects/_id/text-classification/index.vue
index d3d65dfa..a50df08a 100644
--- a/frontend/pages/projects/_id/text-classification/index.vue
+++ b/frontend/pages/projects/_id/text-classification/index.vue
@@ -11,7 +11,20 @@
         class="d-none d-sm-block"
         @click:clear-label="clear"
         @click:review="approve"
-      />
+      >
+        <v-btn-toggle
+          v-model="labelOption"
+          mandatory
+          class="ms-2"
+        >
+          <v-btn icon>
+            <v-icon>mdi-format-list-bulleted</v-icon>
+          </v-btn>
+          <v-btn icon>
+            <v-icon>mdi-text</v-icon>
+          </v-btn>
+        </v-btn-toggle>
+      </toolbar-laptop>
       <toolbar-mobile
         :total="docs.count"
         class="d-flex d-sm-none"
@@ -23,21 +36,24 @@
         @shortkey="addOrRemove"
       >
         <v-card-title>
-          <single-label
-            v-if="project.singleClassClassification"
+          <label-group
+            v-if="labelOption === 0"
             :labels="labels"
             :annotations="annotations"
+            :single-label="project.singleClassClassification"
             @add="add"
             @remove="remove"
           />
-          <text-classification
+          <label-select
             v-else
             :labels="labels"
             :annotations="annotations"
+            :single-label="project.singleClassClassification"
             @add="add"
             @remove="remove"
           />
         </v-card-title>
+        <v-divider />
         <v-card-text class="title highlight" v-text="doc.text" />
       </v-card>
     </template>
@@ -49,10 +65,10 @@
 
 <script>
 import _ from 'lodash'
+import LabelGroup from '@/components/tasks/textClassification/LabelGroup'
+import LabelSelect from '@/components/tasks/textClassification/LabelSelect'
 import LayoutText from '@/components/tasks/layout/LayoutText'
 import ListMetadata from '@/components/tasks/metadata/ListMetadata'
-import SingleLabel from '@/components/tasks/textClassification/SingleLabel'
-import TextClassification from '@/components/tasks/textClassification/TextClassification'
 import ToolbarLaptop from '@/components/tasks/toolbar/ToolbarLaptop'
 import ToolbarMobile from '@/components/tasks/toolbar/ToolbarMobile'
 
@@ -60,10 +76,10 @@ export default {
   layout: 'workspace',
 
   components: {
+    LabelGroup,
+    LabelSelect,
     LayoutText,
     ListMetadata,
-    SingleLabel,
-    TextClassification,
     ToolbarLaptop,
     ToolbarMobile
   },
@@ -89,7 +105,8 @@ export default {
       docs: [],
       labels: [],
       project: {},
-      enableAutoLabeling: false
+      enableAutoLabeling: false,
+      labelOption: 0
     }
   },