added navbar
added navbar
merged