Fix data tables

Hey, I think I got it for you. Check out each commit and for a step by step...

If you like it, just hit the merge pull request button, or you can add the changes manually yourself.