adjust order and modify return button