finished bugs in nav bar with merge changes