Implemented gridly to all of the sorting options and removed the orange background color close #59