More work to custom table cells