applied rest of nav fix