working on the nav some more