Fix count, add more markup