WIP - Bug 988498 - [meta] Calculator Visual Refresh

Not quite done yet.