fix and improve navigation