refactor navigation for cukes

This seems like a more sensible way to do things ...