Mike refactor table sort



<!---
@huboard:{"milestone_order":126.0,"order":3.375,"custom_state":"ready"}
-->

2 different people wrote this