Calculator UI fixes -- Commit 4