Completed to move Mapping Mode selection to Summary Step