fix bugs on nav