updates in checkout form and fixing minor bugs in templates