Fixed ButtonActivity so that both types of clicks work.