Add better navigation

Closes #6.