GridViewTestDisplay class and some little changes