This patch is a warmup to improving the visuals in the calculator demo. Related to #4535
Attach a file by drag & drop or click to upload
