Fix spacing issue and tag inconsistency

![screenshot_2014-12-14_23_04_33](https://cloud.githubusercontent.com/assets/471278/5429309/9a5c60e4-83e6-11e4-803c-1a8985ec33e9.png)