*8774* Implementing grid redesign prototype
*8774* Implementing grid changes