Added more touches to cell and header