fixed billing page and reconfig datamodel