updates for pill buttons on issue #1018