Use same layout as in final step