#168 Changed the grid to State_Label Close #168