Updated markup to be more semantic