Removed tables for calculator

Improved overall design / type sizes