Fix non-intuitive navigation