fixed links, removed links, added new span