Updates for badges and fix for ref issue