Extra navbar links

Closes #985 
Closes #989