the bug 'same billing and shipping addr' solved + refactorized views