Partially moved mapping mode selection to summary step
Re-styled and re-structured SDMX mapping step
Fixed inclusion behaviour