Finalized nav, various fixes and updates