updated grid code to split the two view changes into separate blocks. some weird behavior otherwise.