Changed how Grid is done in MainGrid