Fix navbar
Add regex and fix some bugs