Update layout, add save button