Split the shipping cost calculator modules into form and results (see #1187)