Fix navbar

Fix the navbar generation