better nav functionality