Lots of changes again. Fix #1, Fix #3
Move table rows outside of index.html and include