Update credit calculation to the new model
Minor layout tweaks
Update credit calculation to the new model