Some stuff that'll hopefully get done at some point
Added table sort and cleaned up empty interface