More work on table cell + design work