clarify module files and add nav-bar module back