Moved 'order by' to grid view