Rebuild and clean up main navigation