Refactored Build badges