Improving layout, some more charts.