users now populating
pre-merge
Modified nav bar for logged in users
merge