Fix for ticket Joindin-323

This PR addresses the changes requested in Joindin-323. A link in the navigation, cfe402d, wasn't specifically requested, but it seemed appropriate to add it, so it was added as a separate commit.