Better layout + button on confirmation