Nav bar cleanup

***Note: this PR relies on #2 so make sure to merge that one first***

--------

![image](https://cloud.githubusercontent.com/assets/2835199/2692102/d4cb87aa-c398-11e3-8988-6323cacd8880.png)