added after login navbar links
added after login navbar links fixed
merge conflict on navbar fixed