cleanup; make consistent links in top bar across pages