Fixed Gridview and added typescript