fixed buttons events to include touch