Tidy up StatisticScreen a bit