Revamped the shipping/payment pages

Fixes #2