Billing layout bugs fixed