Rework of submission view and summary view