Added colors to rows. Refactoring