Refactor several tables. Fix for livechart
Merge branch 'master' of https://github.com/borisyankov/binary-static