Updated output for more structual html