big code improvement + badge page