Add sortable columns, fix code speed improvements