* #16: better navigation