Updated tables to allow sort

Moved table contents to objects