Phrasing and getting links to go in the right place

^ basically this