OP-1222 FW_Wizard Ground shapes : Better labels, cleanup