Refine recovery layout
