Added back changes that put in sorting and made cells non-editable