refactor + correction bug nav