finish UI spike 1

The following is the look after spike:
![screen shot 2014-08-04 at 4 24 08 pm](https://cloud.githubusercontent.com/assets/806135/3803836/fb2b9dde-1c1e-11e4-9439-b350ce166116.png)