Navigation improved (Issue 19)