added nav
merged fixes