Fix calculator results

Changes to how and why result box is displayed.
Refactored controller vars into helper methods.
Additional controller and unit tests.