Added navbar
merged