nav UI update & bug fixes