nav/heading cleanup