Fix for table height
Added default DataSet ordering.
Some minor code refactoring.