Refactor stats to avoid small screen display problems -maybe some work needed