Adding automatic alignment for navigation