Nav container fixes

fix things that weren’t clear till trying it out in anger

![screen shot 2014-10-17 at 15 57 00](https://cloud.githubusercontent.com/assets/867233/4680781/c9328206-560d-11e4-93e3-8fdee37df8aa.png)