free of js errors
Merge branch 'tableize'