Minor Grid tweaks #196