Arrange style
Fix calendar counter bug