Changed two-col-table layout and cleaned up shipping input pane.