Remove duplicate badges, fix alignment