Version 2.0 - Remove <table> element, clean up JavaScipt