resolve last issues with nav