Fix bugs with top nav bar

[Closes #7]