Style changes

Related to @mamsden issues. 
![matt1](https://cloud.githubusercontent.com/assets/1077154/5557733/94353418-8d12-11e4-8f06-d6a84878f82c.png)