Improve statistics layout and work