Fixed bugs on checkout form