Remove old colour - looks bad now
Changes to cell and row logic