Made markup more semantic and flexible.