Update to badge and span as per #61