Fix data tables

Hey, I think I got it for you. Check out each commit and for a step by step...