Table markup refactor and new prompt modal system