Move modal away from nav a little
Fix notification z-index issue #4379