rework nav a bit