Updated nav and completed secondary nav pages