More updates to Calculations

Payframe's boxes now fill in