CHANGED TO GRID MODDEL and HTML UPDATED