Updated markup to reflect html