Refactored templates
Payment method selection works now