working on the nav-bar finally