nav pills; refactor naming