Change markup to be more semantic