Grid abstract class removed and start to improve grid classes