Grid and other minor fixes