implement service links
redesign linking services and make specs pass