Build correct grid and improvements.