nav updated and fixes