Not sure why I had this change pending in my working copy
Simplify table markup
Add markers support
Replace alerts to the corresponding marker