New design

Improves the design of ModernCount.