Staging

Let's maybe send these navbar changes to master? I accidentally had already merged my branch with staging but in the future I won't without sending a pull request.