More adjustments and outlining navigation.