Minor method name changes.
Tidied nav_link method.