Fixed return buttons and make agreement