Made markup more semantic