Make nav more generic