working nav
fixed merge conflicts