Last changes to stat layout