fix custom layouts