Minor layout change, more stats and charts