diff --git a/frontend/comp/ImageWall.jsx b/frontend/comp/ImageWall.jsx
index 0e7d5f9..beb545a 100644
--- a/frontend/comp/ImageWall.jsx
+++ b/frontend/comp/ImageWall.jsx
@@ -1,8 +1,21 @@
 import React from 'react';
+import classnames from 'classnames';
+const blockstack = require( 'blockstack' );
 
 
 class OneImage extends React.Component {
-    
+
+    constructor() {
+       super();
+       this.state = { imageData: null };
+    }
+
+    componentWillMount() {
+      blockstack.getFile(this.props.path, { username: this.props.username }).then((imageData) => {
+          this.setState({ imageData });
+      })
+    }
+
     render() {
         return (
         <div className="card">
@@ -13,8 +26,8 @@ class OneImage extends React.Component {
             </div>
 
             <div className="card-image">
-              <figure className="image">
-                <img src={this.props.img} alt="" ref={(img) => { this.foo = img; }}/>
+              <figure className={ classnames('image', { loading: !this.state.imageData }) }>
+                <img src={this.state.imageData || 'img/loading.gif'} alt="" ref={(img) => { this.foo = img; }}/>
               </figure>
             </div>
             
@@ -27,15 +40,13 @@ class OneImage extends React.Component {
                 <time>11:09 PM - 1 Jan 2016</time>
             </div>
             </div>
-          
-
         </div>
         );
         
     }
 
     componentDidMount() {
-        this.foo.onload = () => {   
+        this.foo.onload = () => {
             console.log( this.foo.width + ", " + this.foo.height );
         };
     }
@@ -44,10 +55,11 @@ class OneImage extends React.Component {
 export class ImageWall extends React.Component {
 
     render() {
-        return (<div className="imagewall">
-            { this.props.images.map((image, index) => {
-                return (<OneImage  key={index} img={image} />);
+        const style = this.props.show ? {} : { display: 'None'};
+        return (<div className="imagewall" style={style}>
+            { this.props.imageInfos.map((imageInfo, index) => {
+                return (<OneImage  key={`${imageInfo.path}-${imageInfo.username}`} path={imageInfo.path} username={imageInfo.username} />);
             })} 
         </div>)
     }
-}
\ No newline at end of file
+}
diff --git a/frontend/css/main.scss b/frontend/css/main.scss
index 87648c8..6447d55 100644
--- a/frontend/css/main.scss
+++ b/frontend/css/main.scss
@@ -30,3 +30,8 @@ nav.navbar {
     display: flex;
   }
 }
+
+.image.loading img {
+    width: auto;
+    margin: 1em auto;
+}
diff --git a/frontend/img/loading.gif b/frontend/img/loading.gif
new file mode 100644
index 0000000..0424aa4
Binary files /dev/null and b/frontend/img/loading.gif differ
diff --git a/frontend/index.jsx b/frontend/index.jsx
index 6ff0df7..2a73bef 100644
--- a/frontend/index.jsx
+++ b/frontend/index.jsx
@@ -73,18 +73,9 @@ class App extends React.Component {
         this.setState({index: indexJson});
       }
     })
-      .then(() => {
-        let promises = this.state.index.images.map((image) => {
-          return this.fetchFile(image.path)
-        })
-        return Promise.all(promises)
-      })
-      .then((images) => {
-        this.setState({ images: images })
-      })
-      .catch((e) => {
-        console.error(e)
-      })
+    .catch((e) => {
+      console.error(e)
+    })
   }
 
   loadAESKey() {
@@ -195,9 +186,7 @@ class App extends React.Component {
             console.log('Subscribers indexData is', indexData);
             data.images.forEach((indexEntry) => {
                 if (!this.subscriberImageLoaded({...indexEntry, username})) {
-                  blockstack.getFile(indexEntry.path, {username}).then((imageData) => {
-                      this.updateFeed({path: indexEntry.path, username: username, image: imageData, created: indexEntry.created});
-                  })
+                  this.updateFeed({path: indexEntry.path, username: username, created: indexEntry.created});
                 }
             })
         }).catch(err => {
@@ -245,7 +234,7 @@ class App extends React.Component {
 
 		  <div className="column is-two-thirds">
 
-		  
+
       <div className="tabs is-boxed">
         <ul>
           <li className={ this.state.tab === 'my' ? "is-active" : ''}>
@@ -262,25 +251,21 @@ class App extends React.Component {
           </li>
         </ul>
       </div>
-        { this.state.tab === 'my' ?
-          <div className="container">
-            <ImageWall images={this.state.images} />
-          </div> :
           <div className="container">
-            <ImageWall images={this.state.imageFeed.map(imageData => imageData.image)} />
+            <ImageWall imageInfos={this.state.index.images} show={this.state.tab=='my'}/>
+            <ImageWall imageInfos={this.state.imageFeed} show={this.state.tab=='friends'}/>
           </div>
-        }
 	</div>
 
           <div className="column">
 				<div className="container">
 					<Uploader updateIndexAndImages={this.updateIndexAndImages.bind(this)}/>
 				</div>
-				<div className="container">				
+				<div className="container">
 					<h3>Start again with a fresh wall</h3>
 					<ResetButton />
 				</div>
-		      
+
 			  <div className="container">
           { this.state.loggedIn ? <Subscribers
             addSubscriber={this.addSubscriber.bind(this)}
@@ -288,13 +273,11 @@ class App extends React.Component {
             subscribers={this.state.subscribers}
             updateFeed={this.updateFeed.bind(this)}/> : '' }
 			  </div>
-	  
+
 	              Made with 💙 and 🍕 in Berlin. 
             Thanks to <a href="https://blockstack.org/">blockstack</a>!
           </div>
-		  
 
-		  
         </div>
       </div>
     </section>
diff --git a/package-lock.json b/package-lock.json
index 1a42918..b280845 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1793,6 +1793,11 @@
         }
       }
     },
+    "classnames": {
+      "version": "2.2.5",
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz",
+      "integrity": "sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0="
+    },
     "clean-css": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz",
diff --git a/package.json b/package.json
index 5e30847..a7a7bfc 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "blockstack": "^0.15.1",
     "bulma": "^0.6.2",
     "cash-dom": "^1.3.5",
+    "classnames": "^2.2.5",
     "copy-webpack-plugin": "^4.5.0",
     "handlebars": "^4.0.10",
     "handlebars-template-loader": "^0.8.0",