Added more HTML tags for grid base