Some additions to both pills and badges