Improve navigation simplicity