Better sorting and temporarily forget the grid :(