nav_bar stuff
merged conflict