Initial changes for grid layout