Added wrappers to call button events from Return press