more design
Merge https://github.com/pixelpark/pump.io