Feature/1770 new upgrade page

- [ ] Ready to merge

Todo list
- [ ] Two-step form
- [ ] Hide/show github/normal login
- [ ] Backend for the new payment form
Watch out - `cachebust` is in lowercase here, yet others aren't.