merged philchuang's button changes