More ui updates

![highlight](https://cloud.githubusercontent.com/assets/623/3452165/7acd6e60-01ac-11e4-8149-5da26808ebbc.gif)
![team-name](https://cloud.githubusercontent.com/assets/623/3452178/afb888c6-01ac-11e4-9688-1eee3eeec2e9.gif)

closes #12