Bugs in Nav Solved