Reformat - Use table instead of list