Grid and Type improvements