Improved spacing and wrapper for payment mode select. #950