Cell class - layout standardization

First branch merge