changed image loader to use Future.wait
fixed Future.then parameter