Fixes a few navigation link bugs