am 732916aa: am 8c920dd3: Refactoring CellLayout into three classes

* commit '732916aafe681d1bafbd22bc2a7884b689a57fd3':
  Refactoring CellLayout into three classes