Changed return button id to be unique