fix navigation buttons selectors