Stat Screen Cleanup

Per issue #548

Oh crap... what did I do wrong? How did @Gedan's and @Fenoxo's commits show up?