Fixed up grid and peices