Progress in the Design of In-Vessel Components for ITER