Spacing Fix

Removed tabs, made all spaces :)
Size adjustments,  fixes

Fixed several bugs that were created with my last round of bug fixes.
Adjusted the size and layout of the calculator again, taking advantage
of the grid layout.