diff --git a/src/components/CalculatorContainer.test.ts b/src/components/CalculatorContainer.test.ts
index de44d8f..7305ac5 100644
--- a/src/components/CalculatorContainer.test.ts
+++ b/src/components/CalculatorContainer.test.ts
@@ -22,12 +22,11 @@ describe("Component: CalculatorContainer", () => {
 		await digital1Btn.trigger("click")
 		expect(calculatorScreen.value).toEqual("1")
 
-
 		// Find the Addition button and click it
 		const operationalBtns = wrapper.findAll(".operational-button")
 		const [additionBtn] =  operationalBtns.filter(btn => btn.text() === "+")
 		await additionBtn.trigger("click")
-		expect(calculatorScreen.value).not.toEqual("1+")
+		expect(calculatorScreen.value).toEqual("1+")
 
 		// click digit "1" button again
 		await digital1Btn.trigger("click")
diff --git a/src/components/CalculatorContainer.vue b/src/components/CalculatorContainer.vue
index 9ab0da5..bf641fd 100644
--- a/src/components/CalculatorContainer.vue
+++ b/src/components/CalculatorContainer.vue
@@ -1,18 +1,24 @@
 <script setup lang="ts">
-import { ref } from "vue"
+import { computed, ref } from "vue"
 
-import Button from "@/CalculatorContainer/DigitalButton.vue"
 import Screen from "@/CalculatorContainer/CalculatorScreen.vue"
+import DigitalButton from "@/CalculatorContainer/DigitalButton.vue"
+import EvaluationButton from "@/CalculatorContainer/EvaluationButton.vue"
+import OperationalButton from "@/CalculatorContainer/OperationalButton.vue"
 
 const valueToDisplay = ref("0")
+const isDisplayEmpty = computed(() => valueToDisplay.value === "0")
 function appendToScreen(valueToAppend: number | string) {
-	valueToDisplay.value += valueToAppend
+	if (isDisplayEmpty.value) valueToDisplay.value = String(valueToAppend)
+	else valueToDisplay.value += String(valueToAppend)
 }
 </script>
 
 <template>
 	<Screen :value-to-display="valueToDisplay" />
-	<Button :value="1" @append-to-screen="appendToScreen" />
+	<DigitalButton :value="1" @append-to-screen="appendToScreen" />
+	<OperationalButton value="+" @append-to-screen="appendToScreen" />
+	<EvaluationButton value="=" @append-to-screen="appendToScreen" />
 </template>
 
 <style scoped lang="scss">