added "return" button handler