improve navigation, and configuration