Improved striped rows implementation

Some renaming, use variable for row background when not striped

Change-Id: I5b36fc751aa163dbb127406d7aefad01974fa371