[Stats] Refactor layout