diff --git a/apps/calculator/index.html b/apps/calculator/index.html
index 00a8fec..68c3412 100644
--- a/apps/calculator/index.html
+++ b/apps/calculator/index.html
@@ -92,7 +92,20 @@
     </div>
     <script>
         function appendToDisplay(value) {
-            document.getElementById('display').value += value;
+            // Add spaces around operators
+            if (['+', '-', '*', '/', '%', '^'].includes(value)) {
+                // Check if there's already a space before or after the operator
+                let display = document.getElementById('display').value;
+                if (display && display.slice(-1) !== ' ' && !['+', '-', '*', '/', '%', '^'].includes(display.slice(-1))) {
+                    document.getElementById('display').value += ' ' + value + ' ';
+                } else if (display === '') {
+                    document.getElementById('display').value += ' ' + value + ' ';
+                } else {
+                    document.getElementById('display').value += value;
+                }
+            } else {
+                document.getElementById('display').value += value;
+            }
         }
         function clearDisplay() {
             document.getElementById('display').value = '';
@@ -114,6 +127,32 @@
             }
             return result;
         }
+
+        // Add event listener for keyboard input
+        document.addEventListener('keydown', function(event) {
+            const key = event.key;
+
+            // Handle digit keys and operators
+            if ((key >= '0' && key <= '9') || key === '.' || key === '+' || key === '-' || key === '*' || key === '/' || key === '%' || key === '^') {
+                appendToDisplay(key);
+            } 
+            // Handle special characters and functions
+            else if (key === '(') {
+                appendToDisplay('(');
+            } else if (key === ')') {
+                appendToDisplay(')');
+            } else if (key === 'Enter') {
+                calculateResult();
+            } else if (key === 'Backspace') {
+                backspace();
+            }
+        });
+
+        // Function for handling Backspace
+        function backspace() {
+            let display = document.getElementById('display').value;
+            document.getElementById('display').value = display.slice(0, -1);
+        }
     </script>
 </body>
 </html>