Added dev and test update with new grid layout