Preserve type setting in navigation

Closes #88