Merge "Add the confirm button on the creation selection screen"