nav wording, closes #52, closes #53