Change ordering on POGO display.
Merge branch 'master' into production