finalizing nav changes again :/