Added button up/down events as opposed to a single down event