Fix goal cards

@mhahn
@guymorita please review the latest