Move user country form into its own partial