Fix #243 - Badges visible in application