refactored heading and navigation