Improved layout - Refactored stats, using only one Db query for all stats