pill button updates for issue #577