simplified logic for fill buttons