Fix regression in navigation and use correct button for env rows