Fix draft layouts