tweaking nav bar
tweaking nav bar
merging