refactoring, better navigation class settings
refactoring
refactoring