Fix previous balls page
Merge branch 'master' into staging