Change container to span