diff --git a/.travis.yml b/.travis.yml
index 8d530885bf..dabf931807 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,9 @@ node_js:
 sudo: false
 
 cache:
+  directories:
   - resources
   - node_modules
 
 after_success:
-  which ./node_modules/coveralls/bin/coveralls.js && cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
+  - which ./node_modules/coveralls/bin/coveralls.js && cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
diff --git a/README.md b/README.md
index 84d453e802..cd23272083 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-[![CircleCI](https://img.shields.io/circleci/project/kitematic/kitematic.svg)](https://circleci.com/gh/kitematic/kitematic/tree/master)
+[![Build Status](https://travis-ci.org/kitematic/kitematic.svg?branch=master)](https://travis-ci.org/kitematic/kitematic)
 [![Coverage Status](https://coveralls.io/repos/kitematic/kitematic/badge.svg?branch=master)](https://coveralls.io/r/kitematic/kitematic?branch=master)
-[![bitHound Score](https://app.bithound.io/kitematic/kitematic/badges/score.svg)](http://app.bithound.io/kitematic/kitematic)
+[![bitHound Score](https://www.bithound.io/github/kitematic/kitematic/badges/score.svg)](https://www.bithound.io/github/kitematic/kitematic)
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/kitematic/kitematic?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 ![Kitematic Logo](https://cloud.githubusercontent.com/assets/251292/5269258/1b229c3c-7a2f-11e4-96f1-e7baf3c86d73.png)
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 9933147169..0000000000
--- a/circle.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-machine:
-  node:
-    version: 0.10.36
-dependencies:
-  cache_directories:
-    - "resources"
-    - "node_modules"
-notify:
-  webhooks:
-    - url: https://coveralls.io/webhook
diff --git a/src/ContainerList.react.js b/src/ContainerList.react.js
index dd2ae9b139..1e6f358d6d 100644
--- a/src/ContainerList.react.js
+++ b/src/ContainerList.react.js
@@ -9,8 +9,14 @@ var ContainerList = React.createClass({
   render: function () {
     var self = this;
     var containers = this.props.containers.map(function (container) {
+      var containerId = container.Id;
+      if (!containerId && container.State.Downloading) {
+        // Fall back to the container image name when there is no id. (when the
+        // image is downloading).
+        containerId = container.Image;
+      }
       return (
-        <ContainerListItem key={container.Id} container={container} start={self._start}/>
+        <ContainerListItem key={containerId} container={container} start={self._start} />
       );
     });
     return (