diff --git a/lib/views/home/home_view.dart b/lib/views/home/home_view.dart
index 2d97129..310dce7 100644
--- a/lib/views/home/home_view.dart
+++ b/lib/views/home/home_view.dart
@@ -10,6 +10,8 @@ import 'package:stacked/stacked.dart';
 import 'package:aman_kassa_flutter/core/models/ProductDao.dart';
 import 'package:aman_kassa_flutter/widgets/components/ProductListItem.dart';
 import 'home_view_model.dart';
+import '../../widgets/components/calculator/calculator-buttons.dart';
+import '../../widgets/components/calculator/number-display.dart';
 
 part './tabs/KassaTab.dart';
 part './tabs/CalculatorTab.dart';
diff --git a/lib/views/home/tabs/CalculatorTab.dart b/lib/views/home/tabs/CalculatorTab.dart
index 502d44b..7c6dcfb 100644
--- a/lib/views/home/tabs/CalculatorTab.dart
+++ b/lib/views/home/tabs/CalculatorTab.dart
@@ -9,13 +9,12 @@ class CalculatorTab extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        body: Center(
-          child: Column(
-            children: <Widget>[
-              Text('CalculatorTab index:$index ${viewModel.currentUser.fullName} ',
-                  style: TextStyle(color: Colors.black87))
-            ],
-          ),
+        body: Column(
+          children: <Widget>[
+            NumberDisplay(value: 'values'),
+            CalculatorButtons(onTap: null),
+          ],
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
         ));
   }
 }
\ No newline at end of file
diff --git a/lib/widgets/components/calculator/calculator-button.dart b/lib/widgets/components/calculator/calculator-button.dart
index 47bbaa7..161d128 100644
--- a/lib/widgets/components/calculator/calculator-button.dart
+++ b/lib/widgets/components/calculator/calculator-button.dart
@@ -22,9 +22,9 @@ class CalculatorButton extends StatelessWidget {
               onPressed: () => onTap(buttonText: text),
               child: Text(
                 text,
-                style: TextStyle(fontSize: 18, fontWeight: FontWeight.w500),
+                style: TextStyle(fontSize: 25, fontWeight: FontWeight.w500),
               ),
-              padding: EdgeInsets.all(30),
+              padding: EdgeInsets.all(15),
               highlightColor: Colors.blueGrey[100],
               splashColor: Colors.blueAccent[100],
             )));