fixed navigation with keys