removed nav link helper, cleaned up main navbar