Made the markup more semantic