Fixed statistics & better layout