Better markup and linking