version navigation (with search box) + refactoring