Added more stats and cleaned up the view