Move payment select label and preselect default gateway. #855