Added more stats and fixed the layout and some of the queries