Added custom cell rendering