Checkout: Fix template for BS3. Fix js to properly handles state / city changes without breaking validation or layout