Markup changes for JS to use, debugging and testing