fix nav and basic cleanup