Reworked code, fixed issues

Reworked code from EggyBreads fork and fixed issues.
Removed credit card type selection field during checkout.