Made a few more tweaks to shipping option step.