Refactor GridView Comparer

Update Models