Added cell display. Reworked cell inheritance.
Merge branch 'dev' into feature/row_control_cells
Updates and fixes for merge and cell displays.
Merge branch 'feature/row_control_cells' into dev