Added some table sorting