Adding more stats, moving charts around