Checkout form now works with company checkouts
Further changes to support multiple resolutions
Merge branch 'master' into screens