Bug fix about NavButtons