clean up HTML a bit

Who needs divs?