Continued working on nav