Change grid classname and bugfix