Bug fixes

- potential race condition fix
- added loading screen to credit card entry