Change markup to use headers instead of lists