added nav bar links 2
added nav bar links resolved conflicts