Event refactoring
Fixing original nav bar to window below new nav bar.
Fixed z-index