Improve appearance of calculator
Improve form field appearance
Updated goals table