#29: Improved navigation.