Improving shipping and payment methods

Mail Status wip