- [fixed] Navigation buttons does not work as expected
- [fixed] Rename button in ribbon does not work
- [clean] some code ordering