Fixed functionality of return buttons.