Refactoring to utility class. Cell layout changes