refactored navigators
refactored UI and navigator events
merged