Grid cols structural fixes of entities and removed remove button temporarily